data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -1,9 +1,17 @@ package com.yuanchu.mom.controller; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.text.csv.CsvData; import cn.hutool.core.text.csv.CsvReader; import cn.hutool.core.text.csv.CsvRow; import cn.hutool.core.text.csv.CsvUtil; import cn.hutool.core.util.CharsetUtil; 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.DataReportingCsvDto; import com.yuanchu.mom.dto.DataReportingPageDto; import com.yuanchu.mom.dto.ProductCountDto; import com.yuanchu.mom.dto.RegistrantCountDto; @@ -17,9 +25,21 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.apache.tomcat.util.http.fileupload.FileUtils; import org.springframework.util.FileCopyUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @RequestMapping("/dataReporting") @RestController @@ -45,6 +65,12 @@ @PostMapping("/upDataReporting") public Result upDataReporting(@RequestBody DataReporting dataReporting) { return Result.success(dataReportingService.updateDataReporting(dataReporting)); } @ApiOperation(value = "å 餿°æ®ä¸æ¥ä¿¡æ¯") @PostMapping("/delDataReporting") public Result delDataReporting(Integer id) { return Result.success(dataReportingService.delDataReporting(id)); } @ApiOperation(value = "è·åé¡¹ç®æ±æ»å表") @@ -73,7 +99,7 @@ @ApiOperation(value = "å é¤è¿ç²ä¸æ¥å表") @PostMapping("/delFansSubmit") public Result delFansSubmit(Integer id){ public Result delFansSubmit(Integer id) { return Result.success(fansSubmitService.delFansSubmit(id)); } @@ -99,7 +125,7 @@ @ApiOperation(value = "å é¤è´¢å¡ä¸æ¥å表") @PostMapping("/delFinanceSubmit") public Result delFinanceSubmit(Integer id){ public Result delFinanceSubmit(Integer id) { return Result.success(financeSubmitService.delFinanceSubmit(id)); } @@ -115,11 +141,54 @@ return Result.success(financeSubmitService.addFinanceSubmit(financeSubmit)); } @ValueAuth @ApiOperation(value = "è·åé¦é¡µæ°æ®") @GetMapping("/getDataList") @ValueAuth public Result<?> getDataList() { return Result.success(dataReportingService.getDataList()); } @ValueAuth @ApiOperation(value = "å¯¼å ¥") @PostMapping("/inputCsv") public Result<?> inputCsv(@RequestParam("file") MultipartFile file) throws IOException { CsvReader reader = CsvUtil.getReader(); CsvData data = reader.read(new InputStreamReader(file.getInputStream(), "GB2312")); List<CsvRow> rows = data.getRows(); List<DataReporting> list = new ArrayList<>(); for (int i = 5; i < rows.size(); i++) { DataReporting reporting = new DataReporting(); reporting.setName(rows.get(i).get(0)) .setProduct(rows.get(i).get(1)) .setShowNum(Integer.valueOf(rows.get(i).get(3))) .setClick(Integer.valueOf(rows.get(i).get(4))) // .setAvgPrice(new BigDecimal(rows.get(i).get(5))) .setAccountConsumption(new BigDecimal(rows.get(i).get(6))); // .setSearchBalance(new BigDecimal(rows.get(i).get(6))) // .setInfoBalance(new BigDecimal(rows.get(i).get(7))) // .setVxClick(Double.valueOf(rows.get(i).get(8))) // .setClickThroughRate(rows.get(i).get(9)); list.add(reporting); } dataReportingService.addDataReporting(list); return Result.success(); } @ApiOperation(value = "æ°å¢æ°æ®ä¸æ¥") @PostMapping("/addDataReporting") public Result<?> addDataReporting(@RequestBody DataReporting dataReporting) { ArrayList<DataReporting> list = new ArrayList<>(); list.add(dataReporting); dataReportingService.addDataReporting(list); return Result.success(); } @ApiOperation(value = "å¯¼åºæ°æ®ä¸æ¥å表") @PostMapping("/downDataReportingFile") public Result downDataReportingFile(@RequestBody Map<String, Object> data) { Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class); DataReportingPageDto dataReportingPageDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), DataReportingPageDto.class); return Result.success(dataReportingService.downDataReportingFile(page, dataReportingPageDto)); } } data-server/src/main/java/com/yuanchu/mom/dto/DataReportingCsvDto.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,48 @@ package com.yuanchu.mom.dto; import cn.hutool.core.annotation.Alias; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import java.math.BigDecimal; @Data @AllArgsConstructor @NoArgsConstructor @Accessors(chain = true) public class DataReportingCsvDto { @Alias("è´¦æ·") private String name; @Alias("夿³¨") private String remark; @Alias("å±ç°é") private Integer show; @Alias("ç¹å»é") private Integer click; @Alias("å¹³åç¹å»ä»·æ ¼") private BigDecimal avgPrice; @Alias("æ¶è´¹") private BigDecimal consumption; @Alias("æç´¢æ¨å¹¿ä½é¢") private BigDecimal searchBalance; @Alias("ä¿¡æ¯æµæ¨å¹¿ä½é¢") private BigDecimal infoBalance; @Alias("微信å¤å¶æé®ç¹å»é") private Double vxClick; @Alias("ç¹å»ç") private String clickThroughRate; } data-server/src/main/java/com/yuanchu/mom/dto/DataReportingPageDto.java
@@ -1,5 +1,6 @@ package com.yuanchu.mom.dto; import cn.hutool.core.annotation.Alias; import com.yuanchu.mom.annotation.ValueTableShow; import com.yuanchu.mom.pojo.DataReporting; import io.swagger.annotations.ApiModelProperty; @@ -12,10 +13,12 @@ @NoArgsConstructor public class DataReportingPageDto extends DataReporting { @Alias("åå»ºç¨æ·") @ValueTableShow(21) @ApiModelProperty(value = "åå»ºç¨æ·") private String createUserName; @Alias("æ´æ°ç¨æ·") @ValueTableShow(22) @ApiModelProperty(value = "æ´æ°ç¨æ·") private String updateUserName; data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
@@ -36,6 +36,8 @@ List<Map<String, String>> getDataFor5(); Map<String, String> selectUser(Integer userId); } data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
@@ -9,6 +9,7 @@ import java.time.LocalDateTime; import java.util.Date; import cn.hutool.core.annotation.Alias; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -20,6 +21,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; /** @@ -29,6 +31,7 @@ @Data @AllArgsConstructor @NoArgsConstructor @Accessors(chain = true) public class DataReporting extends OrderBy implements Serializable { /** @@ -41,6 +44,7 @@ /** * ç»è®°äºº */ @Alias("ç»è®°äºº") @Size(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @ApiModelProperty("ç»è®°äºº") @Length(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @@ -49,6 +53,7 @@ /** * é¨é¨ */ @Alias("é¨é¨") @Size(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @ApiModelProperty("é¨é¨") @Length(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @@ -57,6 +62,7 @@ /** * è´¦æ·å */ @Alias("è´¦æ·å") @Size(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @ApiModelProperty("è´¦æ·å") @Length(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @@ -65,6 +71,7 @@ /** * æ¸ é */ @Alias("æ¸ é") @Size(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @ApiModelProperty("æ¸ é") @Length(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @@ -73,6 +80,7 @@ /** * é¡¹ç® */ @Alias("项ç®") @Size(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @ApiModelProperty("项ç®") @Length(max= 255,message="ç¼ç é¿åº¦ä¸è½è¶ è¿255") @@ -81,90 +89,105 @@ /** * å±ç°é */ @Alias("å±ç°é") @ApiModelProperty("å±ç°é") @ValueTableShow(6) private Integer show; private Integer showNum; /** * ç¹å»é */ @Alias("ç¹å»é") @ApiModelProperty("ç¹å»é") @ValueTableShow(7) private Integer click; /** * è´¦æ·æ¶è´¹ */ @Alias("è´¦æ·æ¶è´¹") @ApiModelProperty("è´¦æ·æ¶è´¹") @ValueTableShow(8) private BigDecimal accountConsumption; /** * 客æ·è¿ç¹æ¶è´¹ */ @Alias("客æ·è¿ç¹æ¶è´¹") @ApiModelProperty("客æ·è¿ç¹æ¶è´¹") @ValueTableShow(9) private BigDecimal rebateConsumption; /** * æ¶è´¹ */ @Alias("æ¶è´¹") @ApiModelProperty("æ¶è´¹") @ValueTableShow(10) private BigDecimal consumption; /** * æåæ¶è´¹ */ @Alias("æåæ¶è´¹") @ApiModelProperty("æåæ¶è´¹") @ValueTableShow(11) private BigDecimal discountedConsumption; /** * è¿ç² */ @Alias("è¿ç²") @ApiModelProperty("è¿ç²") @ValueTableShow(12) private Integer fansAdd; /** * å®é ææ¬ */ @Alias("å®é ææ¬") @ApiModelProperty("å®é ææ¬") @ValueTableShow(13) private BigDecimal actualCost; /** * å é¨ææ¬ */ @Alias("å 鍿æ¬") @ApiModelProperty("å 鍿æ¬") @ValueTableShow(14) private BigDecimal internalCosts; /** * å®¢æ·ææ¬ */ @Alias("å®¢æ·ææ¬") @ApiModelProperty("å®¢æ·ææ¬") @ValueTableShow(15) private BigDecimal customerCosts; /** * 婿¶¦ */ @Alias("婿¶¦") @ApiModelProperty("婿¶¦") @ValueTableShow(16) private BigDecimal profit; /** * 代çè¿ç¹ */ @Alias("代çè¿ç¹") @ApiModelProperty("代çè¿ç¹") @ValueTableShow(17) private BigDecimal agentRebate; /** * 客æ·è¿ç¹ */ @Alias("客æ·è¿ç¹") @ApiModelProperty("客æ·è¿ç¹") @ValueTableShow(18) private BigDecimal customerRebate; /** * å¤ç¨å段 */ @Alias("å¤ç¨å段") @ApiModelProperty("å¤ç¨å段") @ValueTableShow(23) private BigDecimal remark; /** * */ @Alias("å建æ¶é´") @ApiModelProperty("å建æ¶é´") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -173,6 +196,7 @@ /** * */ @Alias("æ´æ°æ¶é´") @ApiModelProperty("æ´æ°æ¶é´") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
@@ -7,6 +7,7 @@ import com.yuanchu.mom.pojo.DataReporting; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; import java.util.Map; /** @@ -26,4 +27,10 @@ Map<String, Object> getDataList(); void addDataReporting(List<DataReporting> list); Integer delDataReporting(Integer id); String downDataReportingFile(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto); } data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -1,6 +1,14 @@ package com.yuanchu.mom.service.impl; import cn.hutool.core.text.csv.CsvUtil; import cn.hutool.core.text.csv.CsvWriter; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yuanchu.mom.common.GetLook; import com.yuanchu.mom.common.PrintChina; @@ -10,24 +18,32 @@ import com.yuanchu.mom.pojo.DataReporting; import com.yuanchu.mom.service.DataReportingService; import com.yuanchu.mom.mapper.DataReportingMapper; import com.yuanchu.mom.utils.Jwt; import com.yuanchu.mom.utils.QueryWrappers; import com.yuanchu.mom.utils.ServletUtils; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; /** * @author Administrator * @description é对表ãdata_reporting(æ°æ®ä¸æ¥)ãçæ°æ®åºæä½Serviceå®ç° * @createDate 2023-12-23 10:39:43 */ * @author Administrator * @description é对表ãdata_reporting(æ°æ®ä¸æ¥)ãçæ°æ®åºæä½Serviceå®ç° * @createDate 2023-12-23 10:39:43 */ @Service @AllArgsConstructor public class DataReportingServiceImpl extends ServiceImpl<DataReportingMapper, DataReporting> implements DataReportingService{ implements DataReportingService { private DataReportingMapper dataReportingMapper; @@ -37,7 +53,7 @@ public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) { Map<String, Object> map = new HashMap<>(); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); if(map1.get("look")==1) dataReportingPageDto.setCreateUser(map1.get("userId")); if (map1.get("look") == 1) dataReportingPageDto.setCreateUser(map1.get("userId")); map.put("head", PrintChina.printChina(DataReportingPageDto.class)); map.put("body", dataReportingMapper.selectDataReportingDtoPageList(page, QueryWrappers.queryWrappers(dataReportingPageDto))); return map; @@ -51,9 +67,14 @@ dataReporting2.setCustomerCosts(dataReporting.getCustomerCosts()); dataReporting2.setCustomerRebate(dataReporting.getCustomerRebate()); dataReporting2.setRemark(dataReporting.getRemark()); dataReporting2.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP)); dataReporting2.setConsumption(dataReporting.getCustomerCosts().multiply(BigDecimal.valueOf(dataReporting.getFansAdd()))); System.out.println(dataReporting2); try { dataReporting2.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP)); } catch (Exception e) { } try { dataReporting2.setConsumption(dataReporting.getCustomerCosts().multiply(BigDecimal.valueOf(dataReporting.getFansAdd()))); } catch (Exception e) { } return dataReportingMapper.updateById(dataReporting2); } @@ -61,8 +82,8 @@ public Map<String, Object> selectProductCountDtoPageList(IPage<ProductCountDto> page, ProductCountDto productCountDto) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(ProductCountDto.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); if(map1.get("look")==1) productCountDto.setCreateUser(map1.get("userId")); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectProductCountDtoPageList"); if (map1.get("look") == 1) productCountDto.setCreateUser(map1.get("userId")); map.put("body", dataReportingMapper.selectProductCountDtoPageList(page, QueryWrappers.queryWrappers(productCountDto))); return map; } @@ -71,8 +92,8 @@ public Map<String, Object> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, RegistrantCountDto registrantCountDto) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(RegistrantCountDto.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); if(map1.get("look")==1) registrantCountDto.setCreateUser(map1.get("userId")); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList"); if (map1.get("look") == 1) registrantCountDto.setCreateUser(map1.get("userId")); map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto))); return map; } @@ -87,6 +108,83 @@ map.put("data5", dataReportingMapper.getDataFor5()); return map; } @Override @Transactional(rollbackFor = Exception.class) public void addDataReporting(List<DataReporting> list) { int userId = Integer.parseInt(JSONUtil.parseObj(new Jwt().readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + ""); Map<String, String> map = dataReportingMapper.selectUser(userId); for (DataReporting dataReporting : list) { if (dataReporting.getName() == null) dataReporting.setName(map.get("account")); DataReporting one = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getProduct, dataReporting.getProduct()).eq(DataReporting::getName, dataReporting.getName())); try { dataReporting.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP)); } catch (Exception e) { } try { dataReporting.setConsumption(dataReporting.getCustomerCosts().multiply(new BigDecimal(dataReporting.getFansAdd()))); } catch (Exception e) { } try { dataReporting.setDiscountedConsumption(dataReporting.getConsumption().divide(dataReporting.getAgentRebate(), 2, RoundingMode.HALF_UP)); } catch (Exception e) { } try { dataReporting.setActualCost(dataReporting.getAccountConsumption().divide(new BigDecimal(dataReporting.getFansAdd()), 2, RoundingMode.HALF_UP)); } catch (Exception e) { } try { dataReporting.setProfit(dataReporting.getRebateConsumption().subtract(dataReporting.getConsumption())); } catch (Exception e) { } try { dataReporting.setRemark(dataReporting.getConsumption().subtract(dataReporting.getRebateConsumption())); } catch (Exception e) { } if (ObjectUtil.isEmpty(one)) { dataReporting.setRegistrant(map.get("name")); dataReporting.setDepartment(map.get("department")); dataReportingMapper.insert(dataReporting); } else { dataReporting.setId(one.getId()); dataReporting.setName(null); dataReportingMapper.updateById(dataReporting); } } } @Override public Integer delDataReporting(Integer id) { return dataReportingMapper.deleteById(id); } @Override public String downDataReportingFile(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) { Map<String, Object> map = selectDataReportingList(page, dataReportingPageDto); String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd HH_mm_ss")); String name = "D:\\Download\\æ°æ®ä¸æ¥ " + time + ".csv"; CsvWriter writer = CsvUtil.getWriter(name, CharsetUtil.CHARSET_GBK); writer.write(new String[]{"å¯¼åºæ¶é´ï¼"+time}); writer.write(new String[]{}); writer.write(new String[]{}); writer.write(new String[]{}); writer.write(new String[]{}); List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class); String[] str = new String[head.size()]; for (int i = 0; i < head.size(); i++) { str[i] = head.get(i).get("value"); } writer.write(str); JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{ Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class); for (int i = 0; i < head.size(); i++) { str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+""; } writer.write(str); }); writer.close(); return null; } } data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
@@ -33,7 +33,7 @@ public Map<String, Object> selectFansSubmitList(IPage<FansSubmit> page, FansSubmit fansSubmit) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(FansSubmit.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectFansSubmitList"); if(map1.get("look")==1) fansSubmit.setCreateUser(map1.get("userId")); map.put("body", fansSubmitMapper.selectFansSubmitPageList(page, QueryWrappers.queryWrappers(fansSubmit))); return map; data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
@@ -33,7 +33,7 @@ public Map<String, Object> selectFinanceSubmitList(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(FinanceSubmit.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectFinanceSubmitList"); if(map1.get("look")==1) financeSubmit.setCreateUser(map1.get("userId")); map.put("body", financeSubmitMapper.selectFinanceSubmitPageList(page, QueryWrappers.queryWrappers(financeSubmit))); return map; data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -11,7 +11,7 @@ <result property="product" column="product" jdbcType="VARCHAR"/> <result property="channel" column="channel" jdbcType="VARCHAR"/> <result property="name" column="name" jdbcType="VARCHAR"/> <result property="show" column="show" jdbcType="INTEGER"/> <result property="showNum" column="show_num" jdbcType="INTEGER"/> <result property="click" column="click" jdbcType="INTEGER"/> <result property="accountConsumption" column="account_consumption" jdbcType="DECIMAL"/> <result property="rebateConsumption" column="rebate_consumption" jdbcType="DECIMAL"/> @@ -92,4 +92,8 @@ group by product order by actualCost desc limit 7 </select> <select id="selectUser" resultType="java.util.Map"> select user.department, user.name, user.account from user where id = #{userId} </select> </mapper> framework/src/main/java/com/yuanchu/mom/config/FiferConfig.java
@@ -1,5 +1,6 @@ package com.yuanchu.mom.config; import com.yuanchu.mom.annotation.ValueAuth; import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.utils.Jwt; import com.yuanchu.mom.utils.RedisUtil; @@ -8,6 +9,7 @@ import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; @@ -31,6 +33,11 @@ response.setStatus(HttpServletResponse.SC_OK); return true; } HandlerMethod h = (HandlerMethod)handler; ValueAuth annotation = h.getMethodAnnotation(ValueAuth.class); if(annotation!=null){ return true; } String[] strs = request.getRequestURL().toString().split(serverPort); AtomicBoolean judge = new AtomicBoolean(false); for (String s : list) { framework/src/main/java/com/yuanchu/mom/config/PowerConfig.java
@@ -30,6 +30,9 @@ @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { if(handler instanceof HandlerMethod) { if(request.getRequestURL().toString().equals("http://127.0.0.1:8001/error")){ return HandlerInterceptor.super.preHandle(request, response, handler); } HandlerMethod h = (HandlerMethod)handler; ValueAuth annotation = h.getMethodAnnotation(ValueAuth.class); if(annotation!=null){ @@ -38,7 +41,6 @@ JSONObject obj = JSONUtil.parseObj(new Jwt().readJWT(request.getHeader("token")).get("data")); Integer userId = Integer.parseInt(obj.get("id") + ""); int i = authMapper.isPower(userId, h.getMethod().getName()); if (i == 0){ throw new ErrorException(obj.get("name") + " æ æéè®¿é® " + h.getMethod().getName() + " æ¥å£"); } framework/src/main/java/com/yuanchu/mom/handler/GlobalExceptionHandler.java
@@ -256,6 +256,7 @@ }else { msg="æä»¶ä¸ä¼ 失败ãæå¡å¨å¼å¸¸ã"; } e.printStackTrace(); return Result.fail(msg); } system-run/src/main/java/com/yuanchu/mom/backup/MysqlDataBackup.java
@@ -10,7 +10,7 @@ import java.text.SimpleDateFormat; import java.util.Date; @Component //@Component @EnableScheduling @Slf4j public class MysqlDataBackup { @@ -59,7 +59,7 @@ * æ¯å¤©æä¸23ç¹05ç§æ§è¡ ã 0 0 4 1/1 * ? ã * æµè¯ 20 ç§ä¸æ¬¡ã 0/20 * * * * ? ã@Scheduled(cron = "5 * 23 * * ?") */ @Scheduled(cron = "5 0 23 * * ?") // @Scheduled(cron = "5 0 23 * * ?") private void configureTasks() { log.info("ãå¤ä»½æ°æ®åºã--START"); String dbUrl2 = dbUrl.replace("jdbc:mysql://", ""); system-run/src/main/resources/application-prod.yml
@@ -5,20 +5,20 @@ logging: config: classpath:logback-spring.xml # æ¥å¿åå¨è·¯å¾+++++++++++++++++++++++++++è¿ç»´éè¦é ç½®+++++++++++++++++++++++++++ file-location: /javaWork/Blog/log file-location: /www/wwwroot/syxt.shxiao2.cn/ShengYun # æ°æ®åºå¤ä»½è·¯å¾ backup: # æ°æ®åºå¤ä»½è·¯å¾+++++++++++++++++++++++++++è¿ç»´éè¦é ç½®+++++++++++++++++++++++++++ path: /javaWork/Blog/backup path: /www/wwwroot/syxt.shxiao2.cn/ShengYun # æ°æ®åºå¤ä»½å¤©æ°+++++++++++++++++++++++++++è¿ç»´éè¦é ç½®+++++++++++++++++++++++++++ destiny: 7 # æ°æ®åºå¤ä»½å·¥å ·è·¯å¾+++++++++++++++++++++++++++è¿ç»´éè¦é ç½®+++++++++++++++++++++++++++ mysqldump: /javaWork/Blog/conf mysqldump: /www/wwwroot/syxt.shxiao2.cn/ShengYun # ç §çè·¯å¾+++++++++++++++++++++++++++è¿ç»´éè¦é ç½®+++++++++++++++++++++++++++ file: path: /javaWork/Blog/images path: /www/wwwroot/syxt.shxiao2.cn/ShengYun mybatis-plus: configuration: @@ -29,7 +29,7 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/blog_crunchy?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 url: jdbc:mysql://127.0.0.1:3306/shengyun?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 username: root password: 123456 druid: user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -1,8 +1,9 @@ package com.yuanchu.mom.controller; import cn.hutool.json.JSON; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; import com.yuanchu.mom.common.PrintChina; @@ -13,6 +14,7 @@ import com.yuanchu.mom.utils.JackSonUtil; import com.yuanchu.mom.utils.Jwt; import com.yuanchu.mom.utils.RedisUtil; import com.yuanchu.mom.utils.ServletUtils; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; @@ -105,4 +107,5 @@ else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes())); return Result.success(userService.addUser(user)); } } user-server/src/main/java/com/yuanchu/mom/service/imp/CustomEnumServiceImp.java
@@ -27,7 +27,7 @@ public Map<String, Object> selectCustomEnumList(IPage<CustomEnum> page, CustomEnum customEnum) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(CustomEnum.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectCustomEnumLists"); if(map1.get("look")==1) customEnum.setCreateUser(map1.get("userId")); map.put("body", customEnumMapper.selectPage(page, QueryWrappers.queryWrappers(customEnum))); return map; user-server/src/main/java/com/yuanchu/mom/service/imp/ProductEnumServiceImpl.java
@@ -35,7 +35,7 @@ public Map<String, Object> selectProductEnumList(IPage<ProductEnum> page, ProductEnum productEnum) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(ProductEnum.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectProductEnumLists"); if(map1.get("look")==1) productEnum.setCreateUser(map1.get("userId")); map.put("body", productEnumMapper.selectPage(page, QueryWrappers.queryWrappers(productEnum))); return map; user-server/src/main/java/com/yuanchu/mom/service/imp/RoleServiceImp.java
@@ -46,7 +46,7 @@ public Map<String, Object> selectUserList(IPage<Role> page, Role role) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(Role.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectRoleLists"); if(map1.get("look")==1) role.setCreateUser(map1.get("userId")); map.put("body", roleMapper.selectPage(page, QueryWrappers.queryWrappers(role))); return map; user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
@@ -55,7 +55,7 @@ public Map<String, Object> selectUserList(IPage<UserPageDto> page, UserPageDto user) { Map<String, Object> map = new HashMap<>(); map.put("head", PrintChina.printChina(UserPageDto.class)); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList"); Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList"); if(map1.get("look")==1) user.setCreateUser(map1.get("userId")); map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user))); return map;