From bb3c42dc7d809ed411b0b97ad68730360fbb6269 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 1 Aug 2024 17:55:57 +0800 Subject: [PATCH] bugfix --- .../controller/BmsTemplateInfoController.java | 14 +- .../ent/controller/JDataScreenController.java | 5 +- .../jjh/ent/service/impl/JDataScreenImpl.java | 216 +++++++++++++++++- .../src/main/resources/application-druid.yml | 4 +- .../declaration/BmsTemplateRecordMapper.xml | 4 +- .../mapper/jjh/ent/JDataScreenMapper.xml | 1 - 6 files changed, 232 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java index 5e22489..4a997c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java @@ -5,15 +5,20 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; +import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.parameters.P; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -32,6 +37,8 @@ public class BmsTemplateInfoController extends BaseController { @Autowired private IBmsTemplateInfoService bmsTemplateInfoService; + @Resource + private IBmsDeclarationRecordsService iBmsDeclarationRecordsService; /** * 查询申报模板信息列表 */ @@ -106,7 +113,12 @@ public class BmsTemplateInfoController extends BaseController { @ApiOperation(value = "修改申报模板信息") @PostMapping("/edit") public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) { - return toAjax(bmsTemplateInfoService.updateById(bmsTemplateInfo)); + Long count = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getTemplateId,bmsTemplateInfo.getId()).count(); + if(count>0){ + throw new ServiceException("无法修改!"); + }else { + return toAjax(bmsTemplateInfoService.updateById(bmsTemplateInfo)); + } } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java index 5ed7ec2..e0dd040 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JDataScreenController.java @@ -6,7 +6,10 @@ import com.ruoyi.jjh.ent.entity.response.HonorResponse; import com.ruoyi.jjh.ent.entity.response.ProjectTrackingResponse; import com.ruoyi.jjh.ent.service.JDataScreenService; import com.ruoyi.jjh.ent.service.SmsAlertsService; -import io.swagger.annotations.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java index 8460669..bb9ed6a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JDataScreenImpl.java @@ -2,18 +2,19 @@ package com.ruoyi.jjh.ent.service.impl; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.entity.response.*; import com.ruoyi.jjh.ent.mapper.JDataScreenMapper; +import com.ruoyi.jjh.ent.service.JContactsService; import com.ruoyi.jjh.ent.service.JDataScreenService; +import com.ruoyi.jjh.ent.service.JHeadQuartersRevenueService; import com.ruoyi.jjh.ent.service.JProjectService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; - -import static java.util.stream.Collectors.collectingAndThen; -import static java.util.stream.Collectors.toCollection; +import java.util.ArrayList; +import java.util.List; /** * 数据大屏业务处理层 @@ -30,6 +31,14 @@ public class JDataScreenImpl implements JDataScreenService { @Resource private JProjectService jProjectService; + @Resource + private IBmsEnterpriseBasicInfoService enterpriseBasicInfoService; + + + @Resource + private JHeadQuartersRevenueService jHeadQuartersRevenueService; + @Resource + private JContactsService jc; /** * 荣誉情况 @@ -114,4 +123,203 @@ public class JDataScreenImpl implements JDataScreenService { }); return all; } + +// /** +// * 数据库脱敏 +// */ +// @Override +// public String sqltm() { +// //修改企业库的企业名称 + //规上企业营收企业加密 +// List qyList = enterpriseBasicInfoService.list(); +// List neList = new ArrayList<>(); +// for (BmsEnterpriseBasicInfo items : qyList) { +// String result = items.getQymc().substring(2, items.getQymc().length()-4); +// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); +// be.setId(items.getId()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getQymc(), 0, 2); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4)); +// be.setQymc(stringBuilder.toString()); +// neList.add(be); +// } +// enterpriseBasicInfoService.updateBatchById(neList); + +// //修改企业库的法人姓名 +// List qyList = enterpriseBasicInfoService.list(); +// List neList = new ArrayList<>(); +// for (BmsEnterpriseBasicInfo items : qyList) { +// if(items.getFddbrxm()!=null){ +// String result = items.getFddbrxm().substring(1, items.getFddbrxm().length() ); +// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); +// be.setId(items.getId()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getFddbrxm(), 0, 1); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// be.setFddbrxm(stringBuilder.toString()); +// neList.add(be); +// } +// } +// enterpriseBasicInfoService.updateBatchById(neList); + + + // //修改企业库的法人姓名 +// List qyList = enterpriseBasicInfoService.list(); +// List neList = new ArrayList<>(); +// for (BmsEnterpriseBasicInfo items : qyList) { +// if(items.getFddbrxm()!=null){ +// String result = items.getFddbrxm().substring(1, items.getFddbrxm().length() ); +// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); +// be.setId(items.getId()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getFddbrxm(), 0, 1); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// be.setFddbrxm(stringBuilder.toString()); +// neList.add(be); +// } +// } +// enterpriseBasicInfoService.updateBatchById(neList); + + //修改企业库的手机号 +// List qyList = enterpriseBasicInfoService.list(); +// List neList = new ArrayList<>(); +// for (BmsEnterpriseBasicInfo items : qyList) { +// if(items.getLxdh()!=null& !Objects.equals(items.getLxdh(), "")) { +// if (items.getLxdh().length() >= 10) { +// String result = items.getLxdh().substring(3, items.getLxdh().length() - 4); +// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); +// be.setId(items.getId()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getLxdh(), 0, 3); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getLxdh().substring(items.getLxdh().length() - 4)); +// be.setLxdh(stringBuilder.toString()); +// neList.add(be); +// } else if(items.getLxdh().length() >= 4){ +// String result = items.getLxdh().substring(2, items.getLxdh().length() - 2); +// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); +// be.setId(items.getId()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getLxdh(), 0, 2); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getLxdh().substring(items.getLxdh().length() - 2)); +// be.setLxdh(stringBuilder.toString()); +// neList.add(be); +// } +// } +// } +// enterpriseBasicInfoService.updateBatchById(neList); + + //规上企业营收企业加密 +// List jDataScreenMapper1 = jDataScreenMapper.get1(); +// System.out.println(jDataScreenMapper1.size()); +// List neList = new ArrayList<>(); +// for (BmsEnterpriseBasicInfo items : jDataScreenMapper1) { +// String result = items.getQymc().substring(2, items.getQymc().length()-4); +// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); +// be.setId(items.getId()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getQymc(), 0, 2); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4)); +// be.setQymc(stringBuilder.toString()); +// neList.add(be); +// } +// for (BmsEnterpriseBasicInfo i : neList) { +// jDataScreenMapper.up(i); +// } + //联系人修改 +// List list = jc.list(); +// List newList = new ArrayList<>(); +// for (JContacts items : list) { +// JContacts be = new JContacts(); +// System.out.println(items.getDwAgencykey()); +// be.setDwAgencykey(items.getDwAgencykey()); +// if (items.getQymc() != null) { +// String result = items.getQymc().substring(2, items.getQymc().length() - 4); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getQymc(), 0, 2); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getQymc().substring(items.getQymc().length() - 4)); +// be.setQymc(stringBuilder.toString()); +// } +// if (items.getLlrxm() != null & !Objects.equals(items.getLlrxm(), "")) { +// String result = items.getLlrxm().substring(1, items.getLlrxm().length()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getLlrxm(), 0, 1); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// be.setLlrxm(stringBuilder.toString()); +// } +// if (items.getDzyx() != null & !Objects.equals(items.getDzyx(), "")) { +// StringBuilder stringBuilder = new StringBuilder(); +// for (int i = 0; i < 4; i++) { +// stringBuilder.append("*"); +// } +// String result = items.getDzyx().substring(4, items.getDzyx().length()); +// stringBuilder.append(result); +// be.setDzyx(stringBuilder.toString()); +// } +// if (items.getYddh() != null &!Objects.equals(items.getYddh(), "")) { +// if (items.getYddh().length() >= 10) { +// String result = items.getYddh().substring(3, items.getYddh().length() - 4); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getYddh(), 0, 3); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getYddh().substring(items.getYddh().length() - 4)); +// be.setYddh(stringBuilder.toString()); +// } else if (items.getYddh().length() >= 4) { +// String result = items.getYddh().substring(2, items.getYddh().length() - 2); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getYddh(), 0, 2); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getYddh().substring(items.getYddh().length() - 2)); +// be.setYddh(stringBuilder.toString()); +// } +// } +// newList.add(be); +// } +// jc.updateBatchById(newList); +// +// //修改总部企业 +// List qyList = jDataScreenMapper.getjh(); +// List neList = new ArrayList<>(); +// for (BmsEnterpriseBasicInfo items : qyList) { +// String result = items.getQymc().substring(2, items.getQymc().length()-4); +// BmsEnterpriseBasicInfo be = new BmsEnterpriseBasicInfo(); +// be.setId(items.getId()); +// StringBuilder stringBuilder = new StringBuilder(); +// stringBuilder.append(items.getQymc(), 0, 2); +// for (int i = 0; i < result.length(); i++) { +// stringBuilder.append("*"); +// } +// stringBuilder.append(items.getQymc().substring(items.getQymc().length()-4)); +// be.setQymc(stringBuilder.toString()); +// neList.add(be); +// } +// for (BmsEnterpriseBasicInfo i : neList) { +// jDataScreenMapper.upjh(i); +// } +// return null; +// } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index fb346b7..7a8165e 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -62,8 +62,8 @@ spring: config: multi-statement-allow: true #自己客户端地址 -#returnUrl: http://39.101.188.84:9999/demo/JinJiHu -returnUrl: http://192.168.0.111:80 +returnUrl: http://39.101.188.84:9999/demo/JinJiHu +#returnUrl: http://192.168.0.110:80 #定时任务更新企业信息和联系人的开启 isTiming: false diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml index 68c5b35..9c4267d 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml @@ -33,12 +33,10 @@ a.start_time, a.end_time, b.responsibility_unit, - a.create_time, - c.nick_name as createByName + a.create_time FROM bms_template_record a INNER JOIN bms_template_info b ON a.template_id = b.id - INNER JOIN sys_user c ON b.create_by = c.user_id and a.enterprise_directory like concat('%', #{req.enterpriseDirectory}, '%') diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml index c8f7c05..10ed248 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JDataScreenMapper.xml @@ -3,7 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -