From 7c74c48c9db567fd946d3698833e1496040c70f7 Mon Sep 17 00:00:00 2001 From: 79493 <794930212@qq.com> Date: Fri, 14 Apr 2023 18:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93BUG=E4=BF=AE=E6=94=B9-?= =?UTF-8?q?=E4=BA=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inventory-dao/pom.xml | 2 +- .../bean/dynamic/dto/ChangeDynamicDto.java | 16 ++++- .../com/rzyc/bean/user/dto/FactorListDto.java | 11 ++++ .../java/com/rzyc/mapper/NoticeMapper.java | 2 +- .../com/rzyc/mapper/ent/InListItemMapper.java | 2 + .../rzyc/mapper/user/ListFactorMapper.java | 4 ++ .../java/com/rzyc/model/EntEmRehearsal.java | 2 + .../src/main/java/com/rzyc/model/Notice.java | 10 +++ .../main/java/com/rzyc/model/ent/EntUser.java | 17 +++-- .../main/resources/mapper/NoticeMapper.xml | 3 +- .../mapper/check/BookEntHTMapper.xml | 8 ++- .../resources/mapper/ent/InListItemMapper.xml | 12 ++++ .../mapper/ent/SysEnterpriseMapper.xml | 4 +- .../mapper/user/ListFactorMapper.xml | 11 ++++ .../resources/mapper/user/SysUserMapper.xml | 4 +- .../com/rzyc/service/UserLoginService.java | 2 +- .../src/main/resources/application-yun.yml | 8 +-- .../src/main/resources/application.yml | 2 +- .../com/rzyc/controller/BaseController.java | 65 +++++++++++++++++++ .../rzyc/controller/DynamicController.java | 2 +- .../controller/IndustryListController.java | 19 ++++-- .../rzyc/controller/MinWorkController.java | 5 +- .../rzyc/controller/PcPersonalController.java | 37 ++++++++++- .../controller/ent/PcCompanyController.java | 10 +-- .../filter/JwtAuthenticationTokenFiler.java | 2 +- .../rzyc/service/AssignmentTaskThread.java | 3 + .../com/rzyc/service/PcBusinessService.java | 2 +- .../src/main/resources/application-yun.yml | 8 +-- .../src/main/resources/application.yml | 2 +- 29 files changed, 232 insertions(+), 43 deletions(-) diff --git a/inventory-dao/pom.xml b/inventory-dao/pom.xml index cd296b8..f004b5d 100644 --- a/inventory-dao/pom.xml +++ b/inventory-dao/pom.xml @@ -47,7 +47,7 @@ mysql mysql-connector-java - 8.0.12 + 8.0.31 org.freemarker diff --git a/inventory-dao/src/main/java/com/rzyc/bean/dynamic/dto/ChangeDynamicDto.java b/inventory-dao/src/main/java/com/rzyc/bean/dynamic/dto/ChangeDynamicDto.java index 7cf0f6a..9017c1f 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/dynamic/dto/ChangeDynamicDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/dynamic/dto/ChangeDynamicDto.java @@ -21,11 +21,17 @@ public class ChangeDynamicDto { private String newtitle; /** - * 封面图 + * 封面图存储地址 */ @ApiModelProperty(value = "封面图",required = true) private String coverImage; + /** + * 封面图访问地址 + */ + @ApiModelProperty(value = "封面图",required = true) + private String showImageUrl; + @ApiModelProperty(value = "动态内容",required = true) private String syscnt; @@ -33,6 +39,14 @@ public class ChangeDynamicDto { @ApiModelProperty(value = "发布时间 yyyy-MM-dd HH:mm",required = true) private String publicTime; + public String getShowImageUrl() { + return showImageUrl; + } + + public void setShowImageUrl(String showImageUrl) { + this.showImageUrl = showImageUrl; + } + public String getNewscntid() { return newscntid; } diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/FactorListDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/FactorListDto.java index 9d23ae4..47d5e45 100644 --- a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/FactorListDto.java +++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/FactorListDto.java @@ -15,6 +15,17 @@ public class FactorListDto { @ApiModelProperty(value = "用户id",required = true) private String userId; + @ApiModelProperty(value = "履职清单ID") + private String listFactorId; + + public String getListFactorId() { + return listFactorId; + } + + public void setListFactorId(String listFactorId) { + this.listFactorId = listFactorId; + } + public String getYear() { return year; } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/NoticeMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/NoticeMapper.java index 380f50c..512b561 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/NoticeMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/NoticeMapper.java @@ -34,7 +34,7 @@ public interface NoticeMapper { ListselectList(@Param("checkUserId") String checkUserId, @Param("types") List types); - int updateReadState(@Param("checkUserId") String checkUserId); + int updateReadState(@Param("checkUserId") String checkUserId,@Param("id") String id); /*批量插入*/ Integer insertList(@Param("records") List records); diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java index e8f8fdd..3b0cf20 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java @@ -21,6 +21,8 @@ public interface InListItemMapper extends BaseMapper { List selectContents(@Param("industryId") String industryId, @Param("listId")String listId,@Param("postList")Integer postList); + List selectContentsInGov(@Param("industryId") String industryId, @Param("listId")String listId,@Param("postList")Integer postList); + /*通过行业查询清单信息*/ List findByIndustryId(@Param("industryId") String industryId); diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListFactorMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListFactorMapper.java index 2f05c87..f5b1bf2 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListFactorMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListFactorMapper.java @@ -38,6 +38,10 @@ public interface ListFactorMapper { List userListFactor(@Param("listPerformId") String listPerformId, @Param("time") String time); + /*用户履职档案*/ + ListFactor userListFactorById(@Param("listPerformId") String listPerformId, + @Param("time") String time); + /*修改履职档案完成情况*/ Integer changeIsFinish(@Param("listFactorId") String listFactorId); diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java b/inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java index 23eb9a6..01b38bc 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java @@ -30,10 +30,12 @@ public class EntEmRehearsal implements Serializable { @ApiModelProperty(value = "应急演练开始时间") @TableField("ent_em_rehearsal_start_time") + @JsonFormat(pattern = "yyyy-MM-dd") private Date entEmRehearsalStartTime; @ApiModelProperty(value = "应急演练开始时间") @TableField("ent_em_rehearsal_end_time") + @JsonFormat(pattern = "yyyy-MM-dd") private Date entEmRehearsalEndTime; @ApiModelProperty(value = "应急演练项目") diff --git a/inventory-dao/src/main/java/com/rzyc/model/Notice.java b/inventory-dao/src/main/java/com/rzyc/model/Notice.java index 1c810e6..1af60a9 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/Notice.java +++ b/inventory-dao/src/main/java/com/rzyc/model/Notice.java @@ -67,6 +67,16 @@ public class Notice implements Serializable { @TableField(exist = false) private Long unread; + private String parameter; + + public String getParameter() { + return parameter; + } + + public void setParameter(String parameter) { + this.parameter = parameter; + } + private static final long serialVersionUID = 1L; public Long getTotal() { diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java index 46f67a9..1895404 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java @@ -119,7 +119,7 @@ public class EntUser implements Serializable { private String jobNumber; @TableField(exist = false) - private String token; + private String userToken; @ApiModelProperty(value = "岗位名字") @TableField(exist = false) @@ -177,14 +177,21 @@ public class EntUser implements Serializable { this.entPostName = entPostName; } - public String getToken() { - return token; + public String getPassword() { + return password; } - public void setToken(String token) { - this.token = token; + public void setPassword(String password) { + this.password = password; } + public String getUserToken() { + return userToken; + } + + public void setUserToken(String userToken) { + this.userToken = userToken; + } public String getJobNumber() { return jobNumber; diff --git a/inventory-dao/src/main/resources/mapper/NoticeMapper.xml b/inventory-dao/src/main/resources/mapper/NoticeMapper.xml index 3835dd4..fab9b16 100644 --- a/inventory-dao/src/main/resources/mapper/NoticeMapper.xml +++ b/inventory-dao/src/main/resources/mapper/NoticeMapper.xml @@ -14,6 +14,7 @@ + @@ -286,7 +287,7 @@ - update notice set read_state = 1 where checkUserId = #{checkUserId} + update notice set read_state = 1 where checkUserId = #{checkUserId} and id = #{id} diff --git a/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml b/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml index 955d5d8..fba97ea 100644 --- a/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml +++ b/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml @@ -1457,8 +1457,12 @@ LEFT JOIN BookEntCheck bc ON bh.`BookEntCheckId` = bc.`BookEntCheckId` WHERE se.State = '启用' - and (se.OrgCode = #{areaCode} or se.street_code = #{areaCode} or se.community_code = #{areaCode}) - and se.`EntName` LIKE #{condition} + + and FIND_IN_SET(#{areaCode} ,se.area_path) + + + and se.`EntName` LIKE #{condition} + AND bh.`htreport` = #{htreport} diff --git a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml index 2ec2cfa..668f73c 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml @@ -59,6 +59,18 @@ item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, mod order by sort_id asc + + + + diff --git a/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml b/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml index 766a522..8628154 100644 --- a/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml +++ b/inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml @@ -1138,9 +1138,7 @@ WHERE su.`UserType` = '政府用户' and su.`State` = '启用' and su.SysUserId != #{userId} and (su.`SysUserName` like #{condition} or su.ChinaName like #{condition}) AND su.`SysTitle` IS NOT NULL and su.`SysTitle` != '' - AND (su.`OrgCode` = #{areaCode} - OR su.`street_code` = #{areaCode} - OR su.`community_code` = #{areaCode}) + AND FIND_IN_SET(#{areaCode},su.area_path) ORDER BY lf.`PerformClassCode` ASC,lf.`SortId` ASC limit 50 diff --git a/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java b/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java index 968b860..23a5b5b 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java @@ -90,7 +90,7 @@ public class UserLoginService { entUser.setName(userDetails.getUsername()); entUser.setEntUserId(id); entUser.setEnterpriseId(sysEnterprise.getSysenterpriseid()); - entUser.setToken(token); + entUser.setUserToken(token); entUser.setEntPostName(entPost.getName()); entUser.setPostId(entPost.getPostId()); entUser.setUserTypeName("企业用户"); diff --git a/inventory-ent/src/main/resources/application-yun.yml b/inventory-ent/src/main/resources/application-yun.yml index 763d9d3..8aac7e2 100644 --- a/inventory-ent/src/main/resources/application-yun.yml +++ b/inventory-ent/src/main/resources/application-yun.yml @@ -1,10 +1,9 @@ server: - port: 8019 + port: 7011 spring: redis: host: 172.27.181.247 - Auth: ENC(788KvYFV7cHJUQ31ckyvjTpUQT2sw73E) # 进入哨兵项目-这个端口就不用了，除非是单体 port: 8011 # sentinel: @@ -17,6 +16,7 @@ spring: min-idle: 0 max-wait: 100 shutdown-timeout: 50000 + password: gzQdzRedis servlet: multipart: enabled: true @@ -74,7 +74,7 @@ logging: #文件上传的配置 onstants: #上传文件存放地址 - file_location: /static/rzyc/resource/inventory/uploadFile/ + file_location: /static/resource/inventory/uploadFile/ #上传文件公共地址 file_header: /static/resource/inventory/uploadFile/ #上传文件基础路径 @@ -84,7 +84,7 @@ onstants: #动态详情基础地址 html_header: http://172.27.181.247:8018/ #logourl - logo_url: http://172.27.181.247/static/resource/inventory/citysafe_logo.png + logo_url: http://172.27.181.247:8010/static/resource/inventory/citysafe_logo.png #政府端帮助文档url help_url: http://172.27.181.247:8018/appGovHelp #企业端帮助文档url diff --git a/inventory-ent/src/main/resources/application.yml b/inventory-ent/src/main/resources/application.yml index 7a61ab4..e4120de 100644 --- a/inventory-ent/src/main/resources/application.yml +++ b/inventory-ent/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev #设定打包配置文件 + active: yun #设定打包配置文件 diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 69920d3..7d53db3 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -2035,6 +2035,71 @@ public class BaseController { } } + /** + * 计算提醒类型 1：正常 2：黄色提醒 3：红色提醒 + * @param listFactors + * @throws Exception + */ + protected void handleFactorAlert(ListFactor listFactor)throws Exception{ + System.out.println("Frequency -> "+listFactor.getFrequency()); + + //需要完成的总次数 + Integer factorTotal = listFactor.getCheckstandard() * listFactor.getFrequency(); + listFactor.setFactorTotal(factorTotal); + + //已完成次数 + Integer factorNum = 0; + + if(null != listFactor.getFactorTimes() && listFactor.getFactorTimes().size() > 0){ + factorNum = listFactor.getFactorTimes().size(); + listFactor.setChangeTime(listFactor.getFactorTimes().get(0).getChangeTime()); + } + listFactor.setFactorNum(factorNum); + + + if(!"100".equals(listFactor.getFinishProgres())){ + listFactor.setFactorAlert(4); + } + + /* + * 一年一次 半年一次 每季度一次 每月一次 + * 一年一次 判断当前时间到12月31号的天数 + * 半年一次 先判断是上半年还是下半年 上半年就判断到6月30的天数 下半年判断到12月30号的天数 + * 每季度一次 判断到当前季度最后一天的天数 + * 每月一次 判断到本月最后一天的天数 + * + * 在获取提醒天数 判断提醒类型 黄色 红色 + */ + + FactorDay factorDay = getDay(listFactor.getCheckstandard()); + Integer day = factorDay.getDay(); +// System.out.println("day -> "+day); + + List months = factorDay.getMonths(); + + Integer red = TypeConversion.StringToInteger(listFactor.getRedAlert()); + Integer yellow = TypeConversion.StringToInteger(listFactor.getYellowAlert()); + + + Integer changeMonth = 0; + if(null != listFactor.getChangeTime()){ + changeMonth = DateUtils.parseDate2Calendar(listFactor.getChangeTime()).get(Calendar.MONTH)+1; + } + +// System.out.println("months -> "+months); +// System.out.println("months -> "+changeMonth); +// System.out.println("months.contains(changeMonth) -> "+months.contains(changeMonth)); + if(!(months.contains(changeMonth))){ + //计算报警类型 + if(day <= red){ + listFactor.setFactorAlert(3); + }else if( day >red && day <= yellow){ + listFactor.setFactorAlert(2); + } + + } + } + /** * 获取剩余天数 * @param checkstandard diff --git a/inventory-gov/src/main/java/com/rzyc/controller/DynamicController.java b/inventory-gov/src/main/java/com/rzyc/controller/DynamicController.java index 05a5f48..37c5217 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/DynamicController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/DynamicController.java @@ -134,7 +134,7 @@ public class DynamicController extends com.rzyc.controller.BaseController { newsCnt.setDelState(DelState.NOT_DEL.getState()); //封面图 - newsCnt.setCoverImage(delServiceFile(newsCnt.getCoverImage())); + newsCnt.setCoverImage(delServiceFile(changeDynamicDto.getShowImageUrl())); newsCnt.setPublictime(DateUtils.parseString2Date(changeDynamicDto.getPublicTime(),"yyyy-MM-dd HH:mm")); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java index eb8011f..be9529c 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java @@ -337,9 +337,14 @@ public class IndustryListController extends BaseController{ @ApiOperation(value = "读取行业公共岗位责任清单", notes = "读取行业公共岗位责任清单") @GetMapping("/getIndustryPostDuty") @ResponseBody - public SingleResult getIndustryPostDuty(Integer page , Integer pageSize ,String industryId,@RequestParam(required = true)String postId)throws Exception{ + public SingleResult getIndustryPostDuty(Integer page , Integer pageSize ,String industryId,String postId)throws Exception{ InPostItem inPostItem = inPostItemMapper.selectByPostId(postId); - return pcBusinessService.getIndustryPostDuty(page,pageSize,industryId,inPostItem.getInPostItemId()); + //postId 是岗位id，也是公共清单id，前端将两张表的主键都放进了同一个属性里用于传参 + if (null == inPostItem){ + return pcBusinessService.getIndustryPostDuty(page,pageSize,industryId,postId); + }else { + return pcBusinessService.getIndustryPostDuty(page,pageSize,industryId,inPostItem.getInPostItemId()); + } } @@ -351,9 +356,15 @@ public class IndustryListController extends BaseController{ @ApiOperation(value = "读取行业公共岗位履职清单", notes = "读取行业公共岗位履职清单") @GetMapping("/getIndustryPostListTask") @ResponseBody - public SingleResult getIndustryPostListTask(Integer page , Integer pageSize , String industryId, @RequestParam(required = true)String postId)throws Exception{ + public SingleResult getIndustryPostListTask(Integer page , Integer pageSize , String industryId, String postId)throws Exception{ InPostItem inPostItem = inPostItemMapper.selectByPostId(postId); - return pcBusinessService.getIndustryPostListTask(page,pageSize,industryId,inPostItem.getInPostItemId()); + //postId 是岗位id，也是公共清单id，前端将两张表的主键都放进了同一个属性里用于传参 + if (null == inPostItem){ + return pcBusinessService.getIndustryPostListTask(page,pageSize,industryId,postId); + }else { + return pcBusinessService.getIndustryPostListTask(page,pageSize,industryId,inPostItem.getInPostItemId()); + } + } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java index 8624ff4..fafe4f0 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java @@ -1745,11 +1745,12 @@ public class MinWorkController extends BaseController{ @PostMapping("/noticeEditState") @ApiImplicitParams({ @ApiImplicitParam(name = "checkUserId", value = "检查人Id", required = true, dataType = "string"), + @ApiImplicitParam(name = "id", value = "通知主键", required = true, dataType = "string"), }) @ResponseBody - public SingleResult noticeEditState(String checkUserId) throws Exception { + public SingleResult noticeEditState(String checkUserId,String id) throws Exception { SingleResult singleResult = new SingleResult(); - int result = noticeMapper.updateReadState(checkUserId); + int result = noticeMapper.updateReadState(checkUserId,id); if (result <= 0){ singleResult.setCode(Code.ERROR.getCode()); singleResult.setMessage(Message.ERROR); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 8fab826..378c5c4 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -439,6 +439,41 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { return result; } + /** + * 履职清单（一个） + * @param factorListDto + * @return + * @throws Exception + */ + @LoginAuth + @ApiOperation(value = "履职清单（一个）", notes = "履职清单（一个）") + @PostMapping(value = "/factorListById") + @ResponseBody + public SingleResult factorListById(@Valid FactorListDto factorListDto)throws Exception{ + SingleResult result = new SingleResult<>(); + SysUser sysUser = sysUserMapper.selectByPrimaryKey(factorListDto.getUserId()); + if(null != sysUser && StringUtils.isNotBlank(sysUser.getSystitle())){ + String time = factorListDto.getYear(); + if(StringUtils.isBlank(time)){ + time = DateUtils.getNowDateTimeStr("yyyy"); + } + ListFactor listFactor = listFactorMapper.userListFactorById(sysUser.getSystitle(),time); + if(null != listFactor){ + //处理履职清单 + handleFactorAlert(listFactor); + result.setData(listFactor); + }else{ + result.setData(listFactor); + } + }else{ + result.setCode(Code.NO_DATA.getCode()); + result.setMessage(Message.NO_DATA); + } + return result; + } + + + /** * 履职进度 * @return @@ -2212,8 +2247,6 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { for (SysUser sysUser : users){ if(StringUtils.isNotBlank(sysUser.getPerformClassName())){ String deptName = sysUser.getPerformClassName(); - - sysUser.setChinaname(deptName+"-"+sysUser.getChinaname()); } } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index 27ef414..cdcba96 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -678,16 +678,18 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { sysEnterprise.setQrCode(entQrCode(sysEnterprise.getSysenterpriseid())); result=sysEnterpriseMapper.insert(sysEnterprise); + //生成行业对应的企业责任清单（不包括岗位的清单，只包括行业公共） + SaveEntListThread saveEntListThread = new SaveEntListThread(inListItemMapper,inEntListMapper,getUserId(),sysEnterprise.getWorkClassId(),sysEnterprise.getSysenterpriseid()); + Thread thread = new Thread(saveEntListThread); + thread.start(); + thread.join(); + //创建多个行业岗位 SaveIndustryPostThread saveIndustryPost = new SaveIndustryPostThread(sysEnterprise.getWorkClassId(),sysEnterprise.getSysenterpriseid(),inPostMapper,inPostItemMapper,inPostListMapper,inListItemMapper,sysEnterpriseMapper,entPostMapper, entPostDutyMapper,false); Thread saveIndustryPostThread = new Thread(saveIndustryPost); saveIndustryPostThread.start(); - //生成行业对应的企业责任清单（不包括岗位的清单，只包括行业公共） - SaveEntListThread saveEntListThread = new SaveEntListThread(inListItemMapper,inEntListMapper,getUserId(),sysEnterprise.getWorkClassId(),sysEnterprise.getSysenterpriseid()); - Thread thread = new Thread(saveEntListThread); - thread.start(); //创建法人账号，用于判断手机号重复，单加不影响，没有生成履职清单和工作职责 CopyOnWriteArrayList copyOnWriteArrayList = new CopyOnWriteArrayList(); diff --git a/inventory-gov/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java b/inventory-gov/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java index 3230fa1..a73009a 100644 --- a/inventory-gov/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java +++ b/inventory-gov/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java @@ -71,7 +71,7 @@ public class JwtAuthenticationTokenFiler extends OncePerRequestFilter { SecurityContextHolder.getContext().setAuthentication(authenticationToken); - + System.out.println("授权通行"); filterChain.doFilter(request, response); }catch (AccessDeniedException e){ System.out.println("权限失败"); diff --git a/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java b/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java index dda6cb4..b7f56b3 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java +++ b/inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java @@ -110,12 +110,15 @@ public class AssignmentTaskThread implements Runnable{ private SingleResult insertListAndTask(AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto,String createByUserId) throws Exception { EntPostList entPostList = new EntPostList(); + Calendar calendar = Calendar.getInstance(); SingleResult singleResult = new SingleResult(); BeanUtils.copyProperties(addOrUpdateEntUserPostTaskDto,entPostList); entPostList.setCreateBy(createByUserId); entPostList.setCreateTime(new Date()); entPostList.setDelState(DelState.NOT_DEL.getState()); entPostList.setPostListId(RandomNumber.getUUid()); + //默认清单时间当前年 + entPostList.setYearNum(calendar.get(Calendar.YEAR)); int result = entPostListMapper.insert(entPostList); if (result != 1 ){ singleResult.setCode(Code.ERROR.getCode()); diff --git a/inventory-gov/src/main/java/com/rzyc/service/PcBusinessService.java b/inventory-gov/src/main/java/com/rzyc/service/PcBusinessService.java index e992696..24217b6 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/PcBusinessService.java +++ b/inventory-gov/src/main/java/com/rzyc/service/PcBusinessService.java @@ -58,7 +58,7 @@ public class PcBusinessService extends BaseController { @PageOperation public SingleResult getIndustryPostDuty(Integer page , Integer pageSize ,String industryId,String listId){ SingleResult singleResult = new SingleResult(); - Pageposts = (Page) inListItemMapper.selectContents(industryId,listId,null); + Pageposts = (Page) inListItemMapper.selectContentsInGov(industryId,listId,null); singleResult.setDataPager(posts); return singleResult; } diff --git a/inventory-gov/src/main/resources/application-yun.yml b/inventory-gov/src/main/resources/application-yun.yml index 766edb7..9200eb1 100644 --- a/inventory-gov/src/main/resources/application-yun.yml +++ b/inventory-gov/src/main/resources/application-yun.yml @@ -1,5 +1,5 @@ server: - port: 8018 + port: 7010 spring: servlet: @@ -28,7 +28,7 @@ spring: #数据库 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.27.181.52:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false + url: jdbc:mysql://172.27.181.52:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&autoReconnect=true username: ENC(QE4vB4KHgFwuqi42wTs27w==) password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1) tomcat: @@ -59,7 +59,7 @@ logging: #文件上传的配置 onstants: #上传文件存放地址 - file_location: /static/rzyc/resource/inventory/uploadFile/ + file_location: /static/resource/inventory/uploadFile/ #上传文件公共地址 file_header: /static/resource/inventory/uploadFile/ #上传文件基础路径 @@ -69,7 +69,7 @@ onstants: #动态详情基础地址 html_header: http://172.27.181.247:8018/ #logourl - logo_url: http://172.27.181.247/static/resource/inventory/citysafe_logo.png + logo_url: http://172.27.181.247:8010/static/resource/inventory/citysafe_logo.png #政府端帮助文档url help_url: http://172.27.181.247:8018/appGovHelp #企业端帮助文档url diff --git a/inventory-gov/src/main/resources/application.yml b/inventory-gov/src/main/resources/application.yml index a6560f0..cb53efc 100644 --- a/inventory-gov/src/main/resources/application.yml +++ b/inventory-gov/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev #设定打包配置文件 + active: yun #设定打包配置文件