data-server/pom.xml
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/Main.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/dto/DataReportingCsvDto.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/dto/DataReportingPageDto.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/mapper/FinanceSubmitMapper.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
ÎļþÒÑɾ³ý data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
ÎļþÒÑɾ³ý data-server/src/main/resources/mapper/DataReportingMapper.xml
ÎļþÒÑɾ³ý data-server/src/main/resources/mapper/FansSubmitMapper.xml
ÎļþÒÑɾ³ý data-server/src/main/resources/mapper/FinanceSubmitMapper.xml
ÎļþÒÑɾ³ý framework/src/main/java/com/yuanchu/mom/common/AllController.java
@@ -38,6 +38,10 @@ type = "å é¤"; } else if(remark.contains("æ·»å ")||remark.contains("æ°å¢")){ type = "æ·»å "; } else if(remark.contains("å¯¼å ¥")){ type = "å¯¼å ¥"; } else if(remark.contains("导åº")){ type = "导åº"; } try { authMapper.insertPower(value.getMethod().getName(), remark, type); framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java
@@ -20,9 +20,9 @@ int deletePower(); @Select("select COALESCE(count(*), 0) from power p left join user u on u.role_id = p.role_id where u.id = #{userId} and p.menu_method = #{method}") int isPower(Integer userId, String method); Integer isPower(Integer userId, String method); @Select("select look from power p left join user u on u.role_id = p.role_id where u.id = #{userId} and p.menu_method = #{method}") int countPower(Integer userId, String method); Integer countPower(Integer userId, String method); } pom.xml
@@ -11,15 +11,14 @@ <groupId>com.yuanchu.mom</groupId> <artifactId>mom</artifactId> <version>1.0.0</version> <name>oms</name> <description>oms</description> <name>center-lims</name> <description>center-lims</description> <packaging>pom</packaging> <modules> <module>framework</module> <module>user-server</module> <module>system-run</module> <module>data-server</module> </modules> <properties> system-run/pom.xml
@@ -28,12 +28,6 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <dependency> <groupId>com.yuanchu.mom</groupId> <artifactId>data-server</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> <!--druid--> <dependency> <groupId>com.alibaba</groupId> system-run/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@ logging: config: classpath:logback-spring.xml # æ¥å¿åå¨è·¯å¾+++++++++++++++++++++++++++è¿ç»´éè¦é ç½®+++++++++++++++++++++++++++ file-location: D:\é¹éå ¬å¸\frame-after\logs_IS_UNDEFINED file-location: D:\é¹éå ¬å¸\frame-after\logs # æ°æ®åºå¤ä»½è·¯å¾ backup: @@ -34,7 +34,7 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/shengyun?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 username: root password: 123456 druid: system-run/src/main/resources/application-prod.yml
@@ -29,7 +29,7 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/shengyun?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 username: root password: 123456 druid: user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
@@ -2,18 +2,14 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.pojo.CustomEnum; import com.yuanchu.mom.pojo.ProductEnum; import com.yuanchu.mom.pojo.Role; import com.yuanchu.mom.pojo.User; import com.yuanchu.mom.service.CustomEnumService; import com.yuanchu.mom.service.ProductEnumService; import com.yuanchu.mom.dto.RolePowerDto; import com.yuanchu.mom.pojo.Enums; import com.yuanchu.mom.service.EnumService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -24,71 +20,32 @@ @AllArgsConstructor public class EnumController { private CustomEnumService customEnumService; private EnumService enumService; private ProductEnumService productEnumService; @ApiOperation(value = "è·å客æ·å表") @PostMapping("/selectCustomEnumLists") public Result selectCustomEnumLists(@RequestBody Map<String, Object> data) throws Exception { @ApiOperation(value = "è·åæä¸¾å表") @PostMapping("/selectEnumList") public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); CustomEnum customEnum = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CustomEnum.class); return Result.success(customEnumService.selectCustomEnumList(page, customEnum)); Enums enums = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Enums.class); return Result.success(enumService.selectEnumList(page, enums)); } @ApiOperation(value = "è·å客æ·å表æä¸¾") @GetMapping("/selectCustomEnumList") public Result selectCustomEnumList(){ return Result.success(customEnumService.selectList()); @ApiOperation(value = "æ·»å æä¸¾") @PostMapping("/addEnum") public Result addEnum(@RequestBody Enums enums) { return Result.success(enumService.addEnum(enums)); } @ApiOperation(value = "å é¤å®¢æ·å表") @PostMapping("/delCustomEnum") public Result delCustomEnum(Integer id){ return Result.success(customEnumService.delCustomEnum(id)); @ApiOperation(value = "ä¿®æ¹æä¸¾") @PostMapping("/upEnum") public Result<?> upEnum(@RequestBody Enums enums) { return Result.success(enumService.upEnum(enums)); } @ApiOperation(value = "ä¿®æ¹å®¢æ·ä¿¡æ¯") @PostMapping("/updateCustomEnum") public Result<?> updateCustomEnum(@RequestBody CustomEnum customEnum) { return Result.success(customEnumService.updateCustomEnum(customEnum)); @ApiOperation(value = "å 餿䏾") @PostMapping("/delEnum") public Result<?> delEnum(Integer id) { return Result.success(enumService.delEnum(id)); } @ApiOperation(value = "æ·»å 客æ·ä¿¡æ¯") @PostMapping("/addCustomEnum") public Result<?> addCustomEnum(@RequestBody CustomEnum customEnum) { return Result.success(customEnumService.addCustomEnum(customEnum)); } @ApiOperation(value = "è·å项ç®å表") @PostMapping("/selectProductEnumLists") public Result selectProductEnumLists(@RequestBody Map<String, Object> data) { Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class); ProductEnum productEnum = JSON.parseObject(JSON.toJSONString(data.get("entity")), ProductEnum.class); return Result.success(productEnumService.selectProductEnumList(page, productEnum)); } @ApiOperation(value = "è·å项ç®å表æä¸¾") @GetMapping("/selectProductEnumList") public Result selectProductEnumList(){ return Result.success(productEnumService.selectList()); } @ApiOperation(value = "å é¤é¡¹ç®å表") @PostMapping("/delProductEnum") public Result delProductEnum(Integer id){ return Result.success(productEnumService.delProductEnum(id)); } @ApiOperation(value = "ä¿®æ¹é¡¹ç®ä¿¡æ¯") @PostMapping("/updateProductEnum") public Result<?> updateProductEnum(@RequestBody ProductEnum productEnum) { return Result.success(productEnumService.updateProductEnum(productEnum)); } @ApiOperation(value = "æ·»å 项ç®ä¿¡æ¯") @PostMapping("/addProductEnum") public Result<?> addProductEnum(@RequestBody ProductEnum productEnum) { return Result.success(productEnumService.addProductEnum(productEnum)); } } user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -3,27 +3,15 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.dto.RolePowerDto; import com.yuanchu.mom.dto.UserPageDto; import com.yuanchu.mom.mapper.AuthMapper; import com.yuanchu.mom.mapper.PowerMapper; import com.yuanchu.mom.pojo.CustomEnum; import com.yuanchu.mom.pojo.Power; import com.yuanchu.mom.pojo.Role; import com.yuanchu.mom.pojo.User; import com.yuanchu.mom.service.PowerService; import com.yuanchu.mom.service.RoleService; import com.yuanchu.mom.service.UserService; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.utils.Jwt; import com.yuanchu.mom.utils.RedisUtil; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.apache.ibatis.annotations.ResultType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.HashMap; user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -118,4 +118,10 @@ return Result.success(userService.addUser(user)); } @ApiOperation(value = "è·åç¨æ·ä¿¡æ¯æä¸¾") @GetMapping("/getUserMenu") @ValueAuth public Result<?> getUserMenu() { return Result.success(userService.getUserMenu()); } } user-server/src/main/java/com/yuanchu/mom/mapper/CustomEnumMapper.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ package com.yuanchu.mom.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yuanchu.mom.pojo.Enums; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author Administrator * @description é对表ãenumãçæ°æ®åºæä½Mapper * @createDate 2024-02-26 01:00:03 * @Entity com.yuanchu.mom.pojo.Enums */ public interface EnumMapper extends BaseMapper<Enums> { IPage<Enums> selectEnumPageList(IPage<Enums> page, QueryWrapper<Enums> ew); } user-server/src/main/java/com/yuanchu/mom/mapper/ProductEnumMapper.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,74 @@ package com.yuanchu.mom.pojo; import com.baomidou.mybatisplus.annotation.*; import java.io.Serializable; import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.common.OrderBy; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * * @TableName enum */ @TableName(value ="enums") @Data public class Enums extends OrderBy implements Serializable { /** * */ @ApiModelProperty(value = "主é®") @TableId(type = IdType.AUTO) private Integer id; @ValueTableShow(2) @ApiModelProperty(value = "åç±»") private String category; /** * æ é¢ */ @ValueTableShow(2) @ApiModelProperty(value = "æ é¢") private String label; /** * åæ° */ @ValueTableShow(3) @ApiModelProperty(value = "åæ°") private String value; @ApiModelProperty(value = "åå»ºç¨æ·") @TableField(fill = FieldFill.INSERT) private Integer createUser; @ValueTableShow(4) @ApiModelProperty(value = "åå»ºç¨æ·") private String createUserName; @ValueTableShow(5) @ApiModelProperty(value = "å建æ¶é´") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; @ApiModelProperty(value = "æ´æ°ç¨æ·") @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; @ValueTableShow(6) @ApiModelProperty(value = "æ´æ°ç¨æ·") private String updateUserName; @ValueTableShow(7) @ApiModelProperty(value = "æ´æ°æ¶é´") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; } user-server/src/main/java/com/yuanchu/mom/pojo/ProductEnum.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -37,7 +37,7 @@ private String password; @ValueTableShow(2) @ApiModelProperty(value = "客æ·åç§°") @ApiModelProperty(value = "ç¨æ·å") private String name; @ValueTableShow(3) user-server/src/main/java/com/yuanchu/mom/service/CustomEnumService.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/service/EnumService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ package com.yuanchu.mom.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yuanchu.mom.pojo.Enums; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Map; /** * @author Administrator * @description é对表ãenumãçæ°æ®åºæä½Service * @createDate 2024-02-26 01:00:03 */ public interface EnumService extends IService<Enums> { Map<String, Object> selectEnumList(IPage<Enums> page, Enums enums); int addEnum(Enums enums); int upEnum(Enums enums); int delEnum(Integer id); } user-server/src/main/java/com/yuanchu/mom/service/ProductEnumService.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -22,4 +22,6 @@ int addUser(User user); List<User> getUserMenu(); } user-server/src/main/java/com/yuanchu/mom/service/imp/CustomEnumServiceImp.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/service/imp/ProductEnumServiceImpl.java
ÎļþÒÑɾ³ý user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; @@ -70,4 +71,9 @@ public int addUser(User user) { return userMapper.insert(user); } @Override public List<User> getUserMenu() { return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId)); } } user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,59 @@ package com.yuanchu.mom.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; import com.yuanchu.mom.pojo.Enums; import com.yuanchu.mom.service.EnumService; import com.yuanchu.mom.mapper.EnumMapper; import com.yuanchu.mom.utils.QueryWrappers; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; /** * @author Administrator * @description é对表ãenumãçæ°æ®åºæä½Serviceå®ç° * @createDate 2024-02-26 01:00:03 */ @Service @AllArgsConstructor public class EnumServiceImpl extends ServiceImpl<EnumMapper, Enums> implements EnumService{ private GetLook getLook; private EnumMapper enumMapper; @Override public Map<String, Object> selectEnumList(IPage<Enums> page, Enums enums) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(Enums.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList"); if(map1.get("look")==1) enums.setCreateUser(map1.get("userId")); map.put("body", enumMapper.selectEnumPageList(page, QueryWrappers.queryWrappers(enums))); return map; } @Override public int addEnum(Enums enums) { return enumMapper.insert(enums); } @Override public int upEnum(Enums enums) { return enumMapper.updateById(enums); } @Override public int delEnum(Integer id) { return enumMapper.deleteById(id); } } user-server/src/main/resources/mapper/CustomEnumMapper.xml
ÎļþÒÑɾ³ý user-server/src/main/resources/mapper/EnumMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.yuanchu.mom.mapper.EnumMapper"> <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.Enums"> <id property="id" column="id" jdbcType="INTEGER"/> <result property="label" column="label" jdbcType="VARCHAR"/> <result property="value" column="value" jdbcType="VARCHAR"/> <result property="createUser" column="create_user" jdbcType="INTEGER"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="updateUser" column="update_user" jdbcType="INTEGER"/> <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> </resultMap> <sql id="Base_Column_List"> id,label,value, create_user,create_time,update_user, update_time </sql> <select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums"> select * from ( select e.id,e.category,e.label,e.value, u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time from enums e left join user u2 on u2.id = e.create_user left join user u3 on u3.id = e.update_user ) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> </select> </mapper> user-server/src/main/resources/mapper/ProductEnumMapper.xml
ÎļþÒÑɾ³ý