diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 5a30aed5..5413f86b 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -3,6 +3,9 @@ package com.adc.da.FeignClient; import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; +import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; +import com.adc.da.workFlow.entity.ProcessRollBackEO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,6 +20,18 @@ import java.util.Set; //@FeignClient(value = "shan6") public interface workFlowFeignClient { + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneUpdStatus",method = RequestMethod.GET) + BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOneCount",method = RequestMethod.GET) + BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid); + + @RequestMapping(value = "/bat-wkflow/busProcessModel/processModelHisOne",method = RequestMethod.GET) + BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId); + + @RequestMapping(value = "/bat-wkflow/busProcessEvaluation/evaluationHisList",method = RequestMethod.GET) + List evaluationHisList(@RequestParam("pid") String pid); + @RequestMapping(value = "/bat-wkflow/oaTaskExec/execTask",method = RequestMethod.GET) Map execTask(@RequestParam("todoId") String todoId); @@ -26,6 +41,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) Wrapper activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId); + @RequestMapping(value = "/bat-wkflow/activiti_define_start_user_rollBack",method = RequestMethod.POST) + Wrapper activiti_define_start_rollBack(@RequestBody ProcessRollBackEO processRollBackEO); + /** * 企标复审流程专用 * @param id @@ -44,6 +62,9 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/todoTaskList",method = RequestMethod.POST) List todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/todoTaskListNew",method = RequestMethod.POST) + List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery); + @RequestMapping(value = "/bat-wkflow/completeTask",method = RequestMethod.POST) Wrapper completeTaskByUserId(@RequestBody BusMes busMes); @@ -405,4 +426,7 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/everyDayTenOlockSAM",method = RequestMethod.GET) List everyDayTenOlockSAM(); + + @RequestMapping(value = "/bat-wkflow/delCG",method = RequestMethod.POST) + String delCG(@RequestParam("id") String id); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 6942a7c7..be3ef332 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -8,6 +8,9 @@ import com.adc.da.common.*; import com.adc.da.common.Page; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; +import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.adc.da.workFlow.entity.BusProcessModelHis; +import com.adc.da.workFlow.entity.ProcessRollBackEO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestBody; @@ -25,6 +28,26 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; + public BusProcessModelHis processModelHisOneUpdStatus(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + return stringWrapper; + } + + public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOneCount(pid); + return stringWrapper; + } + + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + BusProcessModelHis stringWrapper = workFlowFeignClient.processModelHisOne(pid,taskId); + return stringWrapper; + } + + public List evaluationHisList(@RequestParam("pid") String pid){ + List stringWrapper = workFlowFeignClient.evaluationHisList(pid); + return stringWrapper; + } + public Map execTask(@RequestParam("todoId") String todoId){ Map stringWrapper = workFlowFeignClient.execTask(todoId); return stringWrapper; @@ -39,6 +62,16 @@ public class workFlowFeignClientImpl { Wrapper stringWrapper = workFlowFeignClient.activiti_define_start(Id,userId,bpnId); return Result.success(stringWrapper.getResult()); } + + public ResponseMessage activiti_define_start_rollBack(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId,@RequestParam("json")String json){ + ProcessRollBackEO rollBackEO=new ProcessRollBackEO(); + rollBackEO.setId(Id); + rollBackEO.setBpnId(bpnId); + rollBackEO.setJson(json); + rollBackEO.setUserId(userId); + Wrapper stringWrapper = workFlowFeignClient.activiti_define_start_rollBack(rollBackEO); + return Result.success(stringWrapper.getResult()); + } public Map activiti_define_start1(@RequestParam("Id") String Id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){ Map map = workFlowFeignClient.activiti_define_start1(Id,userId,standName); return map; @@ -64,6 +97,11 @@ public class workFlowFeignClientImpl { return mapWrapper; } + public List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List mapWrapper = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + return mapWrapper; + } + /** * 开始分页 * @param list @@ -316,4 +354,8 @@ public class workFlowFeignClientImpl { public List queryBusProcessNameForEnd(@RequestBody String prcNum){ return workFlowFeignClient.queryBusProcessNameForEnd(prcNum); } + + public String delCG(@RequestParam("id") String id){ + return workFlowFeignClient.delCG(id); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index dc39c227..67304700 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -16,7 +16,7 @@ public class ActDefineStartMap { Map map = new TreeMap<>(); map.put("1","standardLibraryWkflow"); map.put("2","standardSurveyWorkFlow"); - map.put("3","standardCommentProcessWorkFlow"); + map.put("3","StandAskForOpinion"); map.put("4","standardregulatoryinventory"); map.put("5","projectEvaluationProcess"); map.put("6","Projectcomplianceassessment"); @@ -32,6 +32,9 @@ public class ActDefineStartMap { map.put("laws2","PolicyCommentProcessWorkFlow"); map.put("laws3","KCSTPReviewProcessWorkFlow"); + // 企标制修订流程及企业标准库流程 + map.put("buss1","bussLibraryWkflow"); + //张超然 map.put("20","StandardApplyMeetProcess"); map.put("21","StandardMeetProcess"); diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java index 2229e53e..ff511b51 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/TableToExcel.java @@ -47,20 +47,34 @@ public class TableToExcel { if (j<3) hCell.setCellValue(columnMap.get(key)); } - Cell hCellh = headRow.createCell(2); - hCellh.setCellValue("修改意见内容"); - Cell hCell = headRow.createCell(5); - hCell.setCellValue("提出部门"); - Cell hCell1 = headRow.createCell(6); - hCell1.setCellValue("提出人"); - Cell hCell2 = headRow.createCell(7); - hCell2.setCellValue("处理意见"); - Cell nCell = neckRow.createCell(2); - nCell.setCellValue("修改前"); - Cell nCell1 = neckRow.createCell(3); - nCell1.setCellValue("修改后"); - Cell nCell2 = neckRow.createCell(4); - nCell2.setCellValue("修改理由"); + if (null!=columnMap.get("commentText")) { + Cell hCellh = headRow.createCell(2); + hCellh.setCellValue("修改意见内容"); + } + if (null!=columnMap.get("department")) { + Cell hCell = headRow.createCell(5); + hCell.setCellValue("提出部门"); + } + if (null!=columnMap.get("responUserName")) { + Cell hCell1 = headRow.createCell(6); + hCell1.setCellValue("提出人"); + } + if (null!=columnMap.get("stateText")) { + Cell hCell2 = headRow.createCell(7); + hCell2.setCellValue("处理意见"); + } + if (null!=columnMap.get("oldText")) { + Cell nCell = neckRow.createCell(2); + nCell.setCellValue("修改前"); + } + if (null!=columnMap.get("newText")) { + Cell nCell1 = neckRow.createCell(3); + nCell1.setCellValue("修改后"); + } + if (null!=columnMap.get("reason")) { + Cell nCell1 = neckRow.createCell(4); + nCell1.setCellValue("修改理由"); + } //从第三行开始填充数据 diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java new file mode 100644 index 00000000..a15cbc75 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -0,0 +1,38 @@ +package com.adc.da.workFlow.controller; + + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; +import com.adc.da.workFlow.service.ActSarItemsBussEOService; +import com.adc.da.workFlow.service.ActSarItemsLawsEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/${restPath}/lawss/actSarItemsBuss") +@Api(description = "|ActSarItemsBuss|") +public class ActSarItemsBussEOController extends BaseController { + + @Autowired + private ActSarItemsBussEOService actSarItemsEOService; + +// private static final Logger logger = LoggerFactory.getLogger(AttFileEOController.class); + + @ApiOperation(value = "|SarBussionessStand|企标入库流程") + @PostMapping("/processCreateBuss") + public ResponseMessage processCreateBuss(String infoJson) throws Exception { + if (StringUtils.isNotBlank(infoJson)) { + actSarItemsEOService.processCreateBuss(infoJson); + return Result.success("入库成功"); + } else { + return Result.error("传入数据json不能为空"); + } + } +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 36a98550..dcddca3d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -12,14 +12,15 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.Page; +import com.adc.da.login.util.JwtUtils; +import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.common.EmailUtils; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.workFlow.dao.ExportExcelMapper; -import com.adc.da.workFlow.entity.ExportExcel; -import com.adc.da.workFlow.entity.ExportExcelEO; -import com.adc.da.workFlow.entity.ProcessDetailExport; +import com.adc.da.workFlow.entity.*; import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; @@ -27,14 +28,19 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; +import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; +import java.io.*; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLEncoder; import java.util.*; import java.util.stream.Collectors; @@ -43,12 +49,76 @@ import java.util.stream.Collectors; @Api(tags = "福田标准法规-工作流管理") public class WorkFlowController { + private static final Logger logger = LoggerFactory.getLogger(WorkFlowController.class); + @Autowired private workFlowFeignClientImpl workFlowFeignClient; + @Value("${stand.edit.file.path}") + private String standEditFilePath; + + @Autowired + private JwtUtils jwtUtils; + + @Autowired + private ITsUserService userService; + // @Autowired // private ExportExcelMapper exportExcelMapper; + + + @ApiOperation(value = "手机获取token") + @PostMapping(value = "/loginMobile") + @ResponseBody + public ResponseMessage loginMobile(String taskIds, String pId) throws UnsupportedEncodingException { + BusProcessNew busProcessNew = workFlowFeignClient.queryDetail(taskIds); + if(busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())){ + return Result.error("r0011", "用户不存在"); + } + TsUser userEO = userService.getById(busProcessNew.getUserId()); + if (null == userEO) { + return Result.error("r0011", "用户不存在"); + } + if(userEO.getDisableFlag().equals("1")){ + return Result.error("r0011", "帐号已禁用"); + } + String token = jwtUtils.generateToken(userEO.getUserId()); + userEO.setToken(token); + // 加密重要信息 + BASE64Encoder encoder = new BASE64Encoder(); + String userStr = JSON.toJSONString(userEO); + String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + userStr = encoder.encode(userStr2.getBytes()); + return Result.success(userStr); + } + + + + @ApiOperation(value = "查询在线编辑流程汇总文件编辑对象") + @GetMapping("/processModelHisOneCount") + public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){ + return workFlowFeignClient.processModelHisOneCount(pid); + } + + @ApiOperation(value = "更新在线编辑流程当前节点编辑状态") + @GetMapping("/processModelHisOneUpd") + public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + return workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId); + } + + @ApiOperation(value = "查询在线编辑流程当前节点编辑对象") + @GetMapping("/processModelHisOne") + public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){ + return workFlowFeignClient.processModelHisOne(pid,taskId); + } + + @ApiOperation(value = "查询流程父节点所有评分") + @GetMapping("/evaluationHisList") + public List evaluationHisList(@RequestParam("pid") String pid){ + return workFlowFeignClient.evaluationHisList(pid); + } + @ApiOperation(value = "干活流程接收待办") @GetMapping("/execTask") public Map execTask(@RequestParam("todoId") String todoId){ @@ -106,6 +176,13 @@ public class WorkFlowController { public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){ return workFlowFeignClient.activiti_define_start(id,userId,bpnId); } + + @ApiOperation(value = "启动流程-以流程定义id") + @GetMapping("/activiti_define_start_rollBack") + public ResponseMessage activiti_define_start_rollBack(@RequestParam("id") String id, @RequestParam("userId") String userId, + @RequestParam(value = "bpnId",required = false) String bpnId,@RequestParam(value = "json",required = false)String json){ + return workFlowFeignClient.activiti_define_start_rollBack(id,userId,bpnId,json); + } @ApiOperation(value = "启动流程-以流程定义id") @GetMapping("/activiti_define_start1") public Map activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){ @@ -122,6 +199,16 @@ public class WorkFlowController { } } + @ApiOperation(value = "启动流程-以流程定义id-加上草稿内容（为了实现撤回）") + @PostMapping("/startProcessRollBack") + public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO){ + if(StringUtils.isNotBlank(processRollBackEO.getType())){ + return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(),processRollBackEO.getId(),processRollBackEO.getJson()); + }else { + return null; + } + } + @ApiOperation(value = "定时任务启动流程-以流程定义id") @GetMapping("/startProcessNew") public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value="userId",required = false) String userId, @RequestParam(value="id",required = false) String id){ @@ -280,6 +367,27 @@ public class WorkFlowController { return pageInfo; } + @ApiOperation(value = "我的待办任务列表") + @PostMapping("/todoTaskListNew") + public PageInfo todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){ + List busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery); + List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); + PageInfo pageInfo= new PageInfo(); + if(busProcessNames!=null){ + pageInfo.setList(list1); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(busProcessNames.size())); + pageInfo.setPageSize(taskCommonQuery.getSize()); + }else{ + List list = new ArrayList<>(); + pageInfo.setList(list); + pageInfo.setPageNo(taskCommonQuery.getCurrent()); + pageInfo.setCount(Long.valueOf(0)); + pageInfo.setPageSize(taskCommonQuery.getSize()); + } + return pageInfo; + } + @ApiOperation(value = "完成任务") @PostMapping("/completeTask") public Wrapper completeTaskByUserId( BusMes busMes){ @@ -666,4 +774,12 @@ public class WorkFlowController { } return Result.success("发送成功"); } + + @ApiOperation(value = "草稿删除") + @PostMapping("/delCG") + public String delCG(@RequestParam("id")String id){ + return workFlowFeignClient.delCG(id); + } + + } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java new file mode 100644 index 00000000..e8597c46 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java @@ -0,0 +1,90 @@ +package com.adc.da.workFlow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * OA日志表 + *

+ * + * @author super_liu + * @since 2021-09-17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BusProcessEvaluationHis对象", description="流程评分历史表") +public class BusProcessEvaluationHis implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准id") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "处理人") + @TableField("USER_ID") + private String userId; + + @ApiModelProperty(value = "信息") + @TableField("MESG") + private String mesg; + + @ApiModelProperty(value = "节点信息") + @TableField("TASK_INFO") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + @TableField("P_ID") + private String pId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String updateTime; + + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + + @ApiModelProperty(value = "逻辑状态") + @TableField("FLAG") + private String flag; + + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; + + +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java new file mode 100644 index 00000000..3435eca4 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessModelHis.java @@ -0,0 +1,92 @@ +package com.adc.da.workFlow.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 流程模块历史表 + *

+ * + * @author super_liu + * @since 2021-09-17 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="BusProcessModelHis对象", description="流程模块历史表") +public class BusProcessModelHis implements Serializable { + + private static final long serialVersionUID=1L; + + @ApiModelProperty(value = "主键") + @TableId(value = "ID", type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "标准id") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "处理人") + @TableField("USER_ID") + private String userId; + + @ApiModelProperty(value = "信息") + @TableField("MESG") + private String mesg; + + @ApiModelProperty(value = "节点信息") + @TableField("TASK_INFO") + private String taskInfo; + + @ApiModelProperty(value = "任务id") + @TableField("TASK_ID") + private String taskId; + + @ApiModelProperty(value = "流程实例id") + @TableField("P_ID") + private String pId; + + @ApiModelProperty(value = "流程名称") + @TableField("PRC_NAME") + private String prcName; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String createTime; + + @ApiModelProperty(value = "更新时间") + @TableField("UPDATE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String updateTime; + + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + + @ApiModelProperty(value = "onlyOffice 编辑类型 node 节点编辑 count 汇总编辑") + @TableField("EDIT_TYPE") + private String editType; + + @ApiModelProperty(value = "逻辑状态") + @TableField("FLAG") + private String flag; + + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java index 348a6ce5..1cde1409 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessDetailExport.java @@ -15,7 +15,7 @@ public class ProcessDetailExport { private Date startTime; @Excel(name = "完成时间", orderNum = "4",exportFormat = "yyyy/MM/dd",width = 15) private Date endTime; - @Excel(name = "审批意见", orderNum = "5",width = 15) + @Excel(name = "流程信息", orderNum = "5",width = 15) private String comment; @Excel(name = "状态", orderNum = "6",width = 15) private String flag; diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java new file mode 100644 index 00000000..ad3d7256 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/ProcessRollBackEO.java @@ -0,0 +1,17 @@ +package com.adc.da.workFlow.entity; + +import lombok.Data; + +@Data +public class ProcessRollBackEO { + + private String json; + + private String type; + + private String id; + + private String userId; + + private String bpnId; +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java new file mode 100644 index 00000000..047bfa43 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -0,0 +1,442 @@ +package com.adc.da.workFlow.service; + +import com.adc.da.FeignClientImpl.workFlowFeignClientImpl; +import com.adc.da.common.SarConformStateEnum; +import com.adc.da.common.SarStateColorEnum; +import com.adc.da.common.SarTypeEnum; +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess; +import com.adc.da.slrs.SarCompResAssess.service.ISarCompResAssessService; +import com.adc.da.slrs.SarCompStatusInfo.dao.SarCompStatusInfoDao; +import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo; +import com.adc.da.slrs.SarFileSplitItems.service.ISarFileSplitItemsService; +import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; +import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +import com.adc.da.slrs.sarLawsAttrInfo.service.ISarLawsAttrInfoService; +import com.adc.da.slrs.sarLawsItemVal.dao.SarLawsItemValDao; +import com.adc.da.slrs.sarLawsItems.dao.SarLawsItemsDao; +import com.adc.da.slrs.sarLawsItems.entity.SarLawsItems; +import com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo; +import com.adc.da.slrs.sarLawsStandInfo.service.ISarLawsStandInfoService; +import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.workFlow.dao.ActSarItemsEODao; +import com.adc.da.workFlow.entity.BusProcessEvaluationHis; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.*; + +@Service("actSarItemsBussEOService") +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class ActSarItemsBussEOService { + + private static final Logger logger = LoggerFactory.getLogger(ActSarItemsBussEOService.class); + + @Autowired + private SarStandAttrInfoDao sarStandAttrInfoEODao; + + @Autowired + private workFlowFeignClientImpl workFlowFeignClient; + + @Autowired + private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + + @Autowired + private ISarBussStandAttrInfoService sarBussStandAttrInfoService; + + @Autowired + private ISarBussionessStandService iSarBussionessStandService; + + @Autowired + private IQualityEvaluationService qualityEvaluationService; + + @Autowired + private ISarUpdLogService sarUpdLogEOService; + + + @Value("${elas.flag}") + private boolean elasflag; + + /*** + * @Description: 国内外标准流程入库" + * @Date: 2020/12/7 13:48 + * @Param: [standJson] + * @Return: void + */ + public void processCreateBuss(String standJson) throws Exception{ + Map standMap = new HashMap(); + standMap = JSONObject.parseObject(standJson); + if (standMap != null && !standMap.isEmpty()) { + String prcNum = String.valueOf(standMap.get("prcNum")); + String pid = String.valueOf(standMap.get("topId")); + String prcName = String.valueOf(standMap.get("prcName")); + String standType = String.valueOf(standMap.get("standType")); +// String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 + SarBussionessStand sarBussionessStand = new SarBussionessStand(); +// if(standMap.containsKey("standId")) { +// if (standMap.get("standId") != null && !standMap.get("standId").toString().equals("")) { +// String resId = standMap.get("standId").toString(); +// //此处说明是带入的形式 +// sarStandardsInfoEO.setId(resId); +// SarCompResAssess assessInfoByResId = sarCompResAssessEOService.ssessInfoByResId(resId); +// if (assessInfoByResId != null) { +// assessInfoByResId.setProcessState("2"); +// sarCompResAssessEOService.updateByPrimaryKeySelective(assessInfoByResId); +// } +// } +// } + + Map attInfoMap = new HashMap<>(); + List jsonArray = new ArrayList<>(); + Object breakVal = null; + Object itemList = null; + for (Map.Entry entry : standMap.entrySet()) { + String field = entry.getKey().toUpperCase(); + Object value = entry.getValue(); + if (InitStandAttrUtil.queryFieldListBuss.contains(field)) { + if (value instanceof JSONArray) { + String valStr = String.valueOf(value); + List valueArr = JSONArray.parseArray(valStr,String.class); + if (valueArr != null && !valueArr.isEmpty()) { + String newValue = ""; + for (String val : valueArr) { + newValue += val + ","; + } + newValue = newValue.substring(0,newValue.length()-1); + value = newValue; + }else { + value = ""; + } + } + attInfoMap.put(field,value); + } else { + createStandBaseField(sarBussionessStand,entry.getKey(),value); + } + } + //处理文件 + //此处需要处理之前的文件信息，防止文件丢失 +// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); + String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + // 根据标准号判断数据是否已存在 + //2021年4月9日 此处检查当前是否存在standId + String standCode = ""; + if(StringUtils.isNotBlank(sarBussionessStand.getStandCode()) && !"null".equals(sarBussionessStand.getStandCode())){ + standCode = sarBussionessStand.getStandCode(); + } + List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); +// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { +// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); +// sarStandardsInfoEO.setCountry("CN"); +// } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { +// sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); +// } + //此处判断是否是带入的标准 + String bussId = ""; + if(StringUtils.isNotBlank(sarBussionessStand.getId())) { + bussId = sarBussionessStand.getId(); + SarBussionessStand query = new SarBussionessStand(); + query.setId(sarBussionessStand.getId()); + iSarBussionessStandService.attrInfoDetails(query); + Map attrInfoMap = query.getAttrInfoMap(); + if(attInfoMap!=null && !attInfoMap.isEmpty()){ + updateStandFileFieldData(attInfoMap,attrInfoMap); + resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + } + // 查询原相关流程 + String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId()); + if (StringUtils.isNotBlank(relatePro)) { + String[] processSplit = relatePro.split(","); + Set processSet = new HashSet<>(); + for(String sData:processSplit){ + processSet.add(sData); + } + processSet.add(prcNum); + relatePro = StringUtils.join(processSet.toArray(), ","); + } else { + relatePro = prcNum; + } + // 编辑标准 + iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); + String content = "新增一条相关流程:" +prcName+" "+prcNum; + sarUpdLogEOService.createBaseLog(sarBussionessStand.getId(),standType+"_STAND",content); + }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况 + String standId = lawsList.get(0).getId(); + bussId = lawsList.get(0).getId(); + SarBussionessStand query = new SarBussionessStand(); + query.setId(standId); + iSarBussionessStandService.attrInfoDetails(query); + Map attrInfoMap = query.getAttrInfoMap(); + if(attInfoMap!=null && !attInfoMap.isEmpty()){ + updateStandFileFieldData(attInfoMap,attrInfoMap); + resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); + sarBussionessStand.setSarStandAttrEOStr(resData); + } + // 查询原相关流程 + String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",standId); + if (StringUtils.isNotBlank(relatePro)) { + String[] processSplit = relatePro.split(","); + Set processSet = new HashSet<>(); + for(String sData:processSplit){ + processSet.add(sData); + } + processSet.add(prcNum); + relatePro = StringUtils.join(processSet.toArray(), ","); + } else { + relatePro = prcNum; + } + // 编辑标准 + sarBussionessStand.setId(standId); + iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); + String content = "新增一条相关流程:" +prcName+" "+prcNum; + sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); + } else {//标准号、ID都不存在的情况 + // 新增方法 + ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); + if(responseMessage.isOk()){ + SarBussionessStand bussionessStand = responseMessage.getData(); + bussId = bussionessStand.getId() == null ? "":bussionessStand.getId(); + } + + // 编辑相关流程 + sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",prcNum); + } + List allItems = new ArrayList<>(); + //开始处理条款数据，从去重后的结果中直接处理即可 +// if(itemData!=null && !itemData.isEmpty()){ +// // allItems = +// saveStandItemsData(itemData, sarStandardsInfoEO); +// } + //技术评估结果入库 重构技术评估结果入库内容 +// if ("0".equals(isJudge)) { +// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); +// } + + List evaluationHis = workFlowFeignClient.evaluationHisList(pid); + List evaluations = new ArrayList<>(); + if(!evaluationHis.isEmpty()){ + String finalBussId = bussId; + evaluationHis.forEach(busProcessEvaluationHis -> { + List valueArr = JSONArray.parseArray(busProcessEvaluationHis.getMesg(),JSONObject.class); + if(!valueArr.isEmpty()){ + valueArr.forEach(object -> { + QualityEvaluation evaluation = new QualityEvaluation(); + evaluation.setId(UUIDUtils.randomUUID20()); + evaluation.setLawId(finalBussId); + evaluation.setUserId(object.getString("userId")); + evaluation.setScore(object.getString("score")); + evaluation.setReason(object.getString("reason")); + evaluation.setEvaluationIndex(object.getString("code")); + evaluation.setProcessNode(object.getString("processNode")); + evaluation.setEvaluationType(object.getString("indexType")); + evaluation.setCreateTime(new Date()); + evaluation.setModifyTime(new Date()); + evaluations.add(evaluation); + + }); + } + }); + } + qualityEvaluationService.saveBatch(evaluations); + } + + + } + + private void updateStandFileFieldData(Map addAttInfoMap,Map oldAttInfoMap){ + if(oldAttInfoMap.containsKey("CA")){ + String fileStr = (String) oldAttInfoMap.get("CA"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("CA")?(String)addAttInfoMap.get("CA"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("CA",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("CA",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("ZQYJG")){ + String fileStr = (String) oldAttInfoMap.get("ZQYJG"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("ZQYJG")?(String)addAttInfoMap.get("ZQYJG"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("ZQYJG",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("ZQYJG",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("BPG")){ + String fileStr = (String) oldAttInfoMap.get("BPG"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("BPG")?(String)addAttInfoMap.get("BPG"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("BPG",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("BPG",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("SSG")){ + String fileStr = (String) oldAttInfoMap.get("SSG"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("SSG")?(String)addAttInfoMap.get("SSG"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("SSG",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("SSG",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("ZBJBD")){ + String fileStr = (String) oldAttInfoMap.get("ZBJBD"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("ZBJBD")?(String)addAttInfoMap.get("ZBJBD"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("ZBJBD",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("ZBJBD",fileStr); + } + } + }else if(oldAttInfoMap.containsKey("FBGBJBD")){ + String fileStr = (String) oldAttInfoMap.get("FBGBJBD"); + if(StringUtils.isNotBlank(fileStr)){ + String newFileStr =addAttInfoMap.containsKey("FBGBJBD")?(String)addAttInfoMap.get("FBGBJBD"):null; + if(StringUtils.isNotBlank(newFileStr)){ + String[] fileSplit = fileStr.split(","); + String[] newFileSplit = newFileStr.split(","); + Set fileSet = new HashSet<>(); + for(String sData:fileSplit){ + fileSet.add(sData); + } + for(String sData:newFileSplit){ + fileSet.add(sData); + } + addAttInfoMap.put("FBGBJBD",StringUtils.join(fileSet.toArray(), ",")); + }else{ + addAttInfoMap.put("FBGBJBD",fileStr); + } + } + } + } + + /** + * 处理标准基础库字段 + * @param sarBussionessStand + * @param field + * @param value + * @throws Exception + */ + public void createStandBaseField (SarBussionessStand sarBussionessStand,String field,Object value) throws Exception{ + String valueStr = ""; + if (value != null) { + valueStr = String.valueOf(value); + } + switch (field) { + case "id": sarBussionessStand.setId(valueStr); break; + case "standSort": sarBussionessStand.setStandSort(valueStr); break; + case "standNumber": sarBussionessStand.setStandNumber(valueStr); break; + case "standYear": sarBussionessStand.setStandYear(valueStr); break; + case "standCode": sarBussionessStand.setStandCode(valueStr); break; + case "standName": sarBussionessStand.setStandName(valueStr); break; + case "standEnName": sarBussionessStand.setStandEnName(valueStr); break; + case "textStatusBuss": sarBussionessStand.setTextStatusBuss(valueStr); break; + case "issueTime": + if (StringUtils.isNotBlank(valueStr)) { + sarBussionessStand.setIssueTime(tTo(valueStr)); + } + break; + case "putTime": + if (StringUtils.isNotBlank(valueStr)) { + sarBussionessStand.setPutTime(tTo(valueStr)); + } + break; + case "prcNum": sarBussionessStand.setProcessNum(valueStr); break; + case "menuId": sarBussionessStand.setMenuId(valueStr); break; + case "fileWord": + if (StringUtils.isNotBlank(sarBussionessStand.getFileIds()) && StringUtils.isNotBlank(valueStr)) { + valueStr = sarBussionessStand.getFileIds() + "," + valueStr; + } + sarBussionessStand.setFileIds(valueStr); break; + case "filePdf": + if (StringUtils.isNotBlank(sarBussionessStand.getFileIds()) && StringUtils.isNotBlank(valueStr)) { + valueStr = sarBussionessStand.getFileIds() + "," + valueStr; + } + sarBussionessStand.setFileIds(valueStr); + break; + default: break; + } + } + + private String tTo(String dateStr){ + return dateStr.contains("T") ? dateStr.split("T")[0] : dateStr; + } + +} diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java index 9a56387e..9509383b 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsLawsEOService.java @@ -87,38 +87,6 @@ public class ActSarItemsLawsEOService { @Value("${elas.flag}") private boolean elasflag; - /** - * 标准解读流程入库" - * @param standJson - * @throws Exception - */ - public void createStandardRead(String standJson) throws Exception{ - JSONObject object = JSONObject.parseObject(standJson); - String fileName = object.getString("fileName"); - String fileType = object.getString("fileType"); - String creationTime = object.getString("creationTime"); - String creationUser = object.getString("creationUser"); - String standId = object.getString("standId"); - //数组去重 - JSONArray responUserList1 = object.getJSONArray("itemList"); - for (Object obj:responUserList1) { - JSONObject object1 = (JSONObject) obj; - JSONArray preResponUserList = object1.getJSONArray("zxUserId"); - String oldNumber = object1.getString("oldNumber"); - String itemsNum = object1.getString("itemsNum"); - String itemsName = object1.getString("itemsName"); - String itemsTitle = object1.getString("itemsTitle"); - String applyArcticId = object1.getString("applyArcticId"); - String applyArctic = object1.getString("applyArctic"); - String changePoint = object1.getString("changePoint"); - String technicalRequir = object1.getString("technicalRequir"); - String onlineData = object1.getString("onlineData"); - String newData = object1.getString("newData"); - String complianceRequir = object1.getString("complianceRequir"); - String complianceState = object1.getString("complianceState"); - } - } - /*** * @Description: 国内外标准流程入库" * @Author: yangxuenan diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index 34575906..cb03edc7 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -46,21 +46,22 @@ public class WaterMarkUtil { // 获得PDF最顶层 under = stamper.getOverContent(i); under.saveState(); - // set Transparency - PdfGState gs = new PdfGState(); - // 设置透明度为0.2 - gs.setFillOpacity(0.25f); - under.setGState(gs); + under.restoreState(); under.beginText(); - under.setFontAndSize(base, 50); + under.setFontAndSize(base, 30); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); - for (int y = 0; y < 5; y++) { - for (int x = 0; x < 10; x++) { - // 水印文字成45度角倾斜 + // 设置透明度为0.2 + // set Transparency + PdfGState gs = new PdfGState(); + gs.setFillOpacity(0.2f); + under.setGState(gs); + for (int y = 0; y < 50; y++) { + for (int x = 0; x < 50; x++) { + // 水印文字成45度角倾斜 x位置 y位置 角度 under.showTextAligned(Element.ALIGN_LEFT - , waterMarkName, 100 + 300 * x, 300 * y, 40); + , waterMarkName, 40 + 120 * x, 100 * y, 40); } } diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendUploadConvertService.java b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendUploadConvertService.java new file mode 100644 index 00000000..7a7b42e0 --- /dev/null +++ b/adc-da-convert/src/main/java/com/adc/da/convert/mq/SendUploadConvertService.java @@ -0,0 +1,368 @@ +//package com.adc.da.convert.mq; +// +//import com.adc.da.att.entity.AttFileEO; +//import com.adc.da.att.service.IAttFileEOService; +//import com.adc.da.common.SarTypeEnum; +//import com.adc.da.common.UseModuleEnum; +//import com.adc.da.convert.common.AsposeOfficeConvertUtils; +//import com.adc.da.mq.CreateMQService; +//import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; +//import com.adc.da.slrs.otConvertMq.service.IOtConvertMqService; +//import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao; +//import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; +//import com.adc.da.slrs.sarLawsFile.dao.SarLawsFileDao; +//import com.adc.da.slrs.sarLawsFile.entity.SarLawsFile; +//import com.adc.da.slrs.sarStandFile.dao.SarStandFileDao; +//import com.adc.da.slrs.sarStandFile.entity.SarStandFile; +//import com.adc.da.sys.util.LoginUserUtil; +//import com.adc.da.util.http.ResponseMessage; +//import com.adc.da.util.http.Result; +//import com.adc.da.util.utils.StringUtils; +//import com.adc.da.util.utils.UUID; +//import com.rabbitmq.client.Channel; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.amqp.rabbit.annotation.Exchange; +//import org.springframework.amqp.rabbit.annotation.Queue; +//import org.springframework.amqp.rabbit.annotation.QueueBinding; +//import org.springframework.amqp.rabbit.annotation.RabbitListener; +//import org.springframework.amqp.support.AmqpHeaders; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.messaging.Message; +//import org.springframework.stereotype.Component; +// +//import java.io.File; +//import java.util.Date; +//import java.util.Map; +// +//@Component +//public class SendUploadConvertService { +// +// // 文档转换远程服务IP地址s +// @Value("${convert.host}") +// private String convertHost; +// +// @Value("${server.port}") +// private String port; +// +// @Value("${file.path}") +// private String localFilePath; +// +// @Autowired +// private IAttFileEOService attFileEOService; +// +// @Autowired +// private CreateMQService convertMq; +// +// @Autowired +// private IOtConvertMqService convertMqEOService; +// +// @Autowired +// private SarStandFileDao sarStandFileEODao; +// +// @Autowired +// private SarBussStandFileDao sarBussStandFileEODao; +// +// @Autowired +// private SarLawsFileDao sarLawsFileDao; +// +// private static final Logger logger = LoggerFactory.getLogger(SendUploadConvertService.class); +// +// @RabbitListener(bindings = @QueueBinding( +// value = @Queue(value = "createUploadConvertMQ_SQ_GSAR_RELEASE", durable = "true"), +// exchange = @Exchange(value = "convertUpload-exchange_SQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), +// key = "convertUpload-key_SQ_GSAR_RELEASE")) +// public void createMQ(Map convertInfo, Message message, Channel channel) throws Exception{ +// try{ +// try{ +// Thread.sleep(5000); +// insertConvertMsg(convertInfo); +// }catch(InterruptedException e){ +// logger.error(e.toString()); +// Thread.currentThread().interrupt(); +// } +// } catch (Exception e) { +// logger.error("文档转换消息队列进入添加数据方法前失败！"); +// logger.error(e.getMessage(),e); +// }finally { +// Long tag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); +// channel.basicAck(tag,false); +// } +// +// } +// +// public void insertConvertMsg(Map convertInfo) throws Exception{ +// docUploadConvert(convertMqEO); +// } +// +// /** +// * @Description 文件转换 +// * Date 2018/8/21 15:51 +// * @Param [path] +// * @return com.adc.da.util.http.ResponseMessage +// **/ +// public ResponseMessage docUploadConvert(OtConvertMq convertMqEO) throws Exception{ +// //保存在数据库中的ID +// String path = localFilePath + convertMqEO.getFilePath(); +// path = path.replace("//","/"); +// String convertId = convertMqEO.getId(); +// try { +// //进入转换方法中，修改OT_CONVERT表中状态为转换中 +// convertMqEO.setId(convertId); +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(3); +// convertMqEOService.updateById(convertMqEO); +// //开始转换。。。。。。 +// if(!"".equals(path)){ +// String converfilename = path.replaceAll("\\\\", "/"); +// logger.info("*****上传路径:*******"+localFilePath); +// logger.info("************文件路径：**********" + convertMqEO.getFilePath()); +//// logger.info("************接口：**********" + port); +// logger.info("*****上传路径替换，加入文件名*******"+converfilename); +// //截取文件类型 +// int index = converfilename.lastIndexOf("."); +// String fileType = converfilename.substring(index,converfilename.length()); +// String fileOriName = converfilename.substring(0,index); +//// //调用转换类DocConverter,并将需要转换的文件传递给该类的构造方法 +//// DocConverterPdf d = new DocConverterPdf(converfilename,fileType); +//// d.setConvertHost(convertHost); +//// //调用conver方法开始转换，先执行doc2pdf()将office文件转换为pdf;再执行pdf2swf()将pdf转换为swf; +//// File getPdf = d.conver(fileType); +//// //调用getswfPath()方法，打印转换后的swf文件路径 +//// String dPath = d.getpdfPath(); +// String savePdfFileName = converfilename.substring(0, converfilename.lastIndexOf(".")); +// String savePdfPath = savePdfFileName+".pdf"; +// AsposeOfficeConvertUtils.convertOfficeFileToPDF(fileType,converfilename,savePdfPath); +// File pdfFile = new File(savePdfPath); +// logger.info("*****转换后的pdf文件路径*******"+savePdfPath); +// //判断是否转换成功，修改数据状态 +// if(!savePdfPath.isEmpty() && pdfFile.length()>0){ +// // 上传转换后文件 +// String pdfId = attFileEOService.saveFileAttId(pdfFile); +// logger.info("////////转换后文件id"+pdfId); +// int count = 0; +// if("0".equals(convertMqEO.getAddOrUp())){ +// count = insertConvertDocToFiles(convertMqEO,pdfId,fileOriName,fileType); +// } else { +// //查询之前在资源与文件关联表中是否有转换成功的数据，如果有执行修改，没有执行新增 +// if(StringUtils.isNotEmpty(convertMqEO.getPdfId())){ +// count = updateConvertDocToFIles(convertMqEO,pdfId); +// } else { +// count = insertConvertDocToFiles(convertMqEO,pdfId,fileOriName,fileType); +// } +// } +// convertMqEO.setId(convertId); +// if (count>0) { +// // 转换成功 +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(1); +// convertMqEOService.updateById(convertMqEO); +// } else { +// // 转换失败 +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(2); +// convertMqEOService.updateById(convertMqEO); +// } +// } else { +// // 转换失败 +// convertMqEO.setId(convertId); +// convertMqEO.setModifyTime(new Date()); +// convertMqEO.setMqState(2); +// convertMqEOService.updateById(convertMqEO); +//// if(convertMqEO.getAgainNum()<=5){ +//// throw new Exception("转换失败"); +//// } +// } +// return Result.success(savePdfPath); +// } else { +// logger.error("转换时未获取到文件路径！"); +// return Result.error("文件存储失败，请重试"); +// } +// } catch (Exception e) { +// // 转换失败 +// logger.error("转换过程中失败！"); +// logger.error(e.getMessage(),e); +// convertMqEO.setId(convertId); +// convertMqEO.setMqState(2); +// convertMqEOService.updateById(convertMqEO); +//// this.restartUploadConvert(convertMqEO); +// return Result.error("r0072", "文件转换失败，请重试"); +// } +// } +// +// public ResponseMessage restartUploadConvert(OtConvertMq convertInfo) throws Exception{ +// OtConvertMq convertMqEO = new OtConvertMq(); +// convertMqEO.setLawsId(convertInfo.getLawsId()); +// convertMqEO.setConvertType(convertInfo.getConvertType()); +// convertMqEO.setAttId(convertInfo.getAttId()); +// convertMqEO.setOriAttId(convertInfo.getOriAttId()); +// convertMqEO.setId(convertInfo.getId()); +// convertMqEO.setFilePath(convertInfo.getFilePath()); +// convertMqEO.setAddOrUp(convertInfo.getAddOrUp()); +// convertMqEO.setPdfId(convertInfo.getPdfId()); +// convertMqEO.setStandFileClassify(convertInfo.getStandFileClassify()); +// int countAdd = 0; +// convertMqEO.setAddOrUp("1"); +// int againNumNew = Integer.valueOf(convertInfo.getAgainNum()); +// convertMqEO.setAgainNum(againNumNew+1); +// convertMq.sendMQ(convertMqEO); +// return Result.success("true","已重新加入转换",""); +// +// } +// +// /** +// * @Author yangxuenan +// * @Description 修改标准法规文件表pdf信息 +// * Date 2018/10/31 17:09 +// * @Param [convertMq, pdfId] +// * @return int +// **/ +// public int updateConvertDocToFIles(OtConvertMq convertMq,String pdfId){ +// int countSuccess = 0; +// if(SarTypeEnum.STAND.getValue().equals(convertMq.getConvertType())){ +// SarStandFile lawsFile = new SarStandFile(); +// lawsFile.setId(convertMq.getPdfId()); +// lawsFile.setAttId(pdfId); +// lawsFile.setOriAttId(convertMq.getOriAttId()); +// lawsFile.setModifyTime(new Date()); +// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +// countSuccess = sarStandFileEODao.updateByPrimaryKeySelective(lawsFile); +// } else if (SarTypeEnum.LAWS_STAND.getValue().equals(convertMq.getConvertType())) { +// SarLawsFile lawsFile = new SarLawsFile(); +// lawsFile.setId(convertMq.getPdfId()); +// lawsFile.setAttId(pdfId); +// lawsFile.setOriAttId(convertMq.getOriAttId()); +// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +// lawsFile.setModifyTime(new Date()); +// countSuccess = sarLawsFileDao.updateByPrimaryKeySelective(lawsFile); +// } else if (SarTypeEnum.BUSINESS.getValue().equals(convertMq.getConvertType())) { +// SarBussStandFile lawsFile = new SarBussStandFile(); +// lawsFile.setId(convertMq.getPdfId()); +// lawsFile.setAttId(pdfId); +// lawsFile.setOriAttId(convertMq.getOriAttId()); +// lawsFile.setUseModule(UseModuleEnum.WEB_FILE.getValue()); +// lawsFile.setModifyTime(new Date()); +// countSuccess = sarBussStandFileEODao.updateByPrimaryKeySelective(lawsFile); +// }else if (SarTypeEnum.RECORDS.getValue().equals(convertMq.getConvertType())) { +//// SarBussRecordsFileEO lawsFile = new SarBussRecordsFileEO(); +//// lawsFile.setId(convertMq.getPdfId()); +//// lawsFile.setRecordsId(convertMq.getLawsId()); +//// lawsFile.setAttId(pdfId); +//// lawsFile.setOriAttId(convertMq.getOriAttId()); +//// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +//// lawsFile.setValidFlag("0"); +//// lawsFile.setCreationTime(new Date()); +//// lawsFile.setModifyTime(new Date()); +//// countSuccess = sarBussRecordsFileEODao.updateByPrimaryKeySelective(lawsFile); +// } +// else { +//// SarFileSplitItemsFileEO lawsFile = new SarFileSplitItemsFileEO(); +//// lawsFile.setId(convertMq.getPdfId()); +//// lawsFile.setAttId(pdfId); +////// lawsFile.setOriAttId(convertMq.getOriAttId()); +//// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +//// lawsFile.setModifyTime(new Date()); +//// countSuccess = sarFileSplitItemsFileEODao.updateByPrimaryKeySelective(lawsFile); +// } +// return countSuccess; +// } +// +// /** +// * @Author yangxuenan +// * @Description 添加标准法规文件表pdf信息 +// * Date 2018/10/30 21:52 +// * @Param [convertMq] +// * @return int +// **/ +// public int insertConvertDocToFiles(OtConvertMq convertMq,String pdfId,String fileOriName,String fileType) { +// int countSuccess = 0; +// String creationUser = LoginUserUtil.getUserId(); +// if(SarTypeEnum.STAND.getValue().equals(convertMq.getConvertType())){ +// SarStandFile lawsFile = new SarStandFile(); +// lawsFile.setId(UUID.randomUUID(20)); +// lawsFile.setStandId(convertMq.getLawsId()); +//// lawsFile.setResId(convertMq.getResId()); +// lawsFile.setAttId(pdfId); +// lawsFile.setOriAttId(convertMq.getOriAttId()); +// lawsFile.setValidFlag("0"); +// lawsFile.setCreationUser(creationUser); +// lawsFile.setCreationTime(new Date()); +// lawsFile.setModifyTime(new Date()); +// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +// lawsFile.setStandFileClassify(convertMq.getStandFileClassify()); +// lawsFile.setFileName(fileOriName+".pdf"); +// lawsFile.setFileSuffix("pdf"); +// countSuccess = sarStandFileEODao.insertSelective(lawsFile); +// } else if (SarTypeEnum.LAWS_STAND.getValue().equals(convertMq.getConvertType())) { +// SarLawsFile lawsFile = new SarLawsFile(); +// lawsFile.setId(UUID.randomUUID(20)); +// lawsFile.setLawsId(convertMq.getLawsId()); +// lawsFile.setResId(convertMq.getResId()); +// lawsFile.setAttId(pdfId); +// lawsFile.setOriAttId(convertMq.getOriAttId()); +// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +// lawsFile.setValidFlag(0); +// lawsFile.setCreationTime(new Date()); +// lawsFile.setModifyTime(new Date()); +// lawsFile.setLawsFileClassify(convertMq.getLawsFileClassify()); +// lawsFile.setFileName(fileOriName+".pdf"); +// lawsFile.setFileSuffix("pdf"); +// countSuccess = sarLawsFileDao.insertSelective(lawsFile); +// } else if (SarTypeEnum.BUSINESS.getValue().equals(convertMq.getConvertType())) { +// SarBussStandFile lawsFile = new SarBussStandFile(); +// lawsFile.setId(UUID.randomUUID(20)); +// lawsFile.setStandId(convertMq.getLawsId()); +// lawsFile.setResId(convertMq.getResId()); +// lawsFile.setAttId(pdfId); +// lawsFile.setOriAttId(convertMq.getOriAttId()); +// lawsFile.setUseModule(UseModuleEnum.WEB_FILE.getValue()); +// lawsFile.setStandFileClassify(convertMq.getStandFileClassify()); +// lawsFile.setFileName(fileOriName+".pdf"); +// lawsFile.setFileSuffix("pdf"); +// lawsFile.setValidFlag(0); +// lawsFile.setCreationTime(new Date()); +// lawsFile.setModifyTime(new Date()); +// countSuccess = sarBussStandFileEODao.insertSelective(lawsFile); +// } +// else if (SarTypeEnum.RECORDS.getValue().equals(convertMq.getConvertType())) { +//// SarBussRecordsFileEO lawsFile = new SarBussRecordsFileEO(); +//// lawsFile.setId(UUID.randomUUID(20)); +//// lawsFile.setRecordsId(convertMq.getLawsId()); +//// lawsFile.setResId(convertMq.getResId()); +//// lawsFile.setAttId(pdfId); +//// lawsFile.setOriAttId(convertMq.getOriAttId()); +//// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +//// lawsFile.setRecordsFileClassify(convertMq.getStandFileClassify()); +//// lawsFile.setFileName(fileOriName+".pdf"); +//// lawsFile.setFileSuffix("pdf"); +//// lawsFile.setValidFlag("0"); +//// lawsFile.setCreationTime(new Date()); +//// lawsFile.setModifyTime(new Date()); +//// countSuccess = sarBussRecordsFileEODao.insertSelective(lawsFile); +// }else { +//// SarFileSplitItemsFileEO lawsFile = new SarFileSplitItemsFileEO(); +//// lawsFile.setId(UUID.randomUUID(20)); +//// lawsFile.setStandId(convertMq.getLawsId()); +//// lawsFile.setResId(convertMq.getResId()); +//// lawsFile.setAttId(pdfId); +////// lawsFile.setOriAttId(convertMq.getOriAttId()); +//// lawsFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); +//// lawsFile.setValidFlag(0); +//// lawsFile.setCreationTime(new Date()); +//// lawsFile.setModifyTime(new Date()); +//// countSuccess = sarFileSplitItemsFileEODao.insertSelective(lawsFile); +// } +// return countSuccess; +// } +// +// /** +// * 文档转换逻辑 +// * @param attFileEO +// */ +// public void insertOrUpdateStandInfo(AttFileEO attFileEO){ +// +// } +// +// +//} diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/controller/OtConvertController.java b/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/controller/OtConvertController.java index 054a1c48..1319afe8 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/controller/OtConvertController.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/controller/OtConvertController.java @@ -1,18 +1,38 @@ package com.adc.da.convert.otConvert.controller; +import com.adc.da.att.controller.AttFileEOController; import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.convert.common.AsposeOfficeConvertUtils; import com.adc.da.convert.mq.CreateConvertMQService; +import com.adc.da.convert.otConvert.service.IOtConvertService; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; import com.adc.da.convert.otConvert.entity.OtConvert; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** *

@@ -24,12 +44,51 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(tags = "|OtConvert| 文档转换") -@RequestMapping("/OtConvert") +@RequestMapping("/${restPath}/OtConvert") public class OtConvertController extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(OtConvertController.class); + + @Value("${file.path}") + private String filePath;//文件存储路径 + + @Value("${upload.file.white.lists}") + private String uploadFileWhiteLists; //上传文件白名单 + + @Autowired + private IOtConvertService iOtConvertService; + + @Autowired + private IAttFileEOService attFileEOService; + @Autowired private CreateConvertMQService createConvertMQService; + @ApiOperation(value = "|OtActConvertEO|根据文件ID获取流程转换文档") + @GetMapping(value = "/getConvertFileByAttId") + public ResponseMessage getConvertFileByAttId(String attId) throws Exception { + // 根据attId查到地址 + if(StringUtils.isNotBlank(attId)){ + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("ACT_FILE_ID",attId); + List resultList = iOtConvertService.list(wrapper); + if(resultList!=null && !resultList.isEmpty()){ + OtConvert convertEO = resultList.get(0); + if(StringUtils.isNotBlank(convertEO.getConvertFileId())){ + AttFileEO attFileEO = attFileEOService.getFileInfo(convertEO.getConvertFileId()); + convertEO.setConvertFileInfo(attFileEO); + return Result.success(convertEO); + }else{ + return Result.success("-100","查询的转件文件未找到，请检查状态",convertEO); + } + }else{ + return Result.error("-1","查询的转换记录不存在",null); + } + }else{ + return Result.error("-1","查询的转换文档ID不存在",null); + } + } + /** * @Author super_liu * @Description 查询文件信息 diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/entity/OtActConvertEO.java b/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/entity/OtActConvertEO.java new file mode 100644 index 00000000..a6d00c6d --- /dev/null +++ b/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/entity/OtActConvertEO.java @@ -0,0 +1,144 @@ +package com.adc.da.convert.otConvert.entity; + +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.base.entity.BaseEntity; + +import java.util.Date; + +/** + * 功能：OT_ACT_CONVERT OtActConvertEOEntity
+ * 作者：code generator
+ * 日期： 2021-03-19
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class OtActConvertEO extends BaseEntity { + + private String id; + private String actFileId; + private String convertState; + private String convertFileId; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + // 转换后文件信息 + private AttFileEO ConvertFileInfo; + + + + /** + * java字段名转换为原始数据库列名。如果不存在则返回null
+ *

字段列表：

+ *
  • id -> id
    • + *
  • actFileId -> act_file_id
    • + *
  • convertState -> convert_state
    • + *
  • convertFileId -> convert_file_id
    • + *
  • createTime -> create_time
    • + *
  • modifyTime -> modify_time
    • + */ + public static String fieldToColumn(String fieldName) { + if (fieldName == null) { return null; }; + switch (fieldName) { + case "id": return "id"; + case "actFileId": return "act_file_id"; + case "convertState": return "convert_state"; + case "convertFileId": return "convert_file_id"; + case "createTime": return "create_time"; + case "modifyTime": return "modify_time"; + default: return null; + } + } + + /** + * 原始数据库列名转换为java字段名。如果不存在则返回null
    + *

    字段列表：

    + *
  • id -> id
    • + *
  • act_file_id -> actFileId
    • + *
  • convert_state -> convertState
    • + *
  • convert_file_id -> convertFileId
    • + *
  • create_time -> createTime
    • + *
  • modify_time -> modifyTime
    • + */ + public static String columnToField(String columnName) { + if (columnName == null) { return null; }; + switch (columnName) { + case "id": return "id"; + case "act_file_id": return "actFileId"; + case "convert_state": return "convertState"; + case "convert_file_id": return "convertFileId"; + case "create_time": return "createTime"; + case "modify_time": return "modifyTime"; + default: return null; + } + } + + /** 主键 **/ + public String getId() { + return this.id; + } + + /** 主键 **/ + public void setId(String id) { + this.id = id; + } + + /** 流程中待转换文件ID **/ + public String getActFileId() { + return this.actFileId; + } + + /** 流程中待转换文件ID **/ + public void setActFileId(String actFileId) { + this.actFileId = actFileId; + } + + /** 转换状态：LODING:待转换 SUCCESS:成功 ERROR:错误 **/ + public String getConvertState() { + return this.convertState; + } + + /** 转换状态：LODING:待转换 SUCCESS:成功 ERROR:错误 **/ + public void setConvertState(String convertState) { + this.convertState = convertState; + } + + /** 转换后文件ID **/ + public String getConvertFileId() { + return this.convertFileId; + } + + /** 转换后文件ID **/ + public void setConvertFileId(String convertFileId) { + this.convertFileId = convertFileId; + } + + /** 数据创建时间 **/ + public Date getCreateTime() { + return this.createTime; + } + + /** 数据创建时间 **/ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** 数据修改时间 **/ + public Date getModifyTime() { + return this.modifyTime; + } + + /** 数据修改时间 **/ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + + public AttFileEO getConvertFileInfo() { + return ConvertFileInfo; + } + + public void setConvertFileInfo(AttFileEO convertFileInfo) { + ConvertFileInfo = convertFileInfo; + } +} diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/entity/OtConvert.java b/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/entity/OtConvert.java index 2d4e6567..317086c6 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/entity/OtConvert.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/otConvert/entity/OtConvert.java @@ -1,5 +1,6 @@ package com.adc.da.convert.otConvert.entity; +import com.adc.da.att.entity.AttFileEO; import com.adc.da.base.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableId; @@ -62,5 +63,7 @@ public class OtConvert extends BaseEntity { @TableField("VALID_FLAG") private Integer validFlag; - + // 转换后文件信息 + @TableField(exist = false) + private AttFileEO ConvertFileInfo; } diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 85625c89..b1186a6d 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -63,6 +63,17 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/sarStandUnqualified/sar-stand-unqualified/exportStandUnqulifiedExcel"); //文件预览 addInterceptor.excludePathPatterns("/api/att/attFile/getFileInfo"); + // onlyOffice 回调 + addInterceptor.excludePathPatterns("/api/lawss/activiti/recieveFile"); + + // 手机获取token + addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOne"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/processModelHisOneCount"); + + addInterceptor.excludePathPatterns("/api/att/attFile/getSyncPdfFileInfo"); //附件下载 addInterceptor.excludePathPatterns("/api/att/attFile/downloadFileForSar"); //水印下载 @@ -70,6 +81,10 @@ public class WebMvcConfig implements WebMvcConfigurer { //企业标准导出 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportSarBussionessStand"); + //预警导出 + addInterceptor.excludePathPatterns("/api/sys/EarlyWarning/exportWarning"); + + //OCR回调存储文件 addInterceptor.excludePathPatterns("/api/ocr/OCRRestful/OcrHandleResult"); @@ -81,6 +96,10 @@ public class WebMvcConfig implements WebMvcConfigurer { //调研流程下载接口 addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile"); + addInterceptor.excludePathPatterns("/api/lawss/activiti/exportProcessDetailInfo"); + + addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); @@ -88,7 +107,7 @@ public class WebMvcConfig implements WebMvcConfigurer { - // 添加自定义拦截器，并拦截对应 url +// // 添加自定义拦截器，并拦截对应 url addInterceptor.addPathPatterns("/**"); } } diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java index 8e9a93ae..6a4b9032 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java @@ -18,13 +18,13 @@ public class CodeGen { private static final String PACKAGE_PATH="/adc-da-slrs/src/main"; - private static final String AUTHOR="super_liu"; + private static final String AUTHOR="zhaokaiyao"; - private static final String DB_IP="127.0.0.1:3306/foton_slrs_test"; + private static final String DB_IP="123.56.177.15:3306/foton_slrs_test2"; private static final String DB_USER="root"; - private static final String DB_PWD="root"; + private static final String DB_PWD="RsLDRj3dXtSwYjBI"; /** diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6f42d8db..a6f3ac0c 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -138,8 +138,11 @@ verifyCodeMode=1 # ============================================================================= # file模块上传文件的服务器地址 file.path=D:/uploadfile/bus -# 文件下载地址参数 -file.downloadUrl=http://39.98.140.126:10001/uploadPath + +stand.edit.file.path = /usr/laws/file/ +# onlyoffice 预览地址 +file.downloadUrl=http://10.100.5.116:1080/file/ + #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index beb4b269..256281d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -3,28 +3,35 @@ package com.adc.da.scheduled; import com.adc.da.scheduled.dao.SarStandardInfoDao; import com.adc.da.scheduled.dao.SarStandardItemDao; import com.adc.da.scheduled.dao.SarStandardWarningDao; -import com.adc.da.scheduled.entity.DataDTO; -import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.scheduled.entity.TermDTO; + import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; + import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.sun.corba.se.spi.ior.iiop.IIOPFactories; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.PostConstruct; import java.time.LocalDate; import java.util.*; import java.util.regex.Pattern; +import java.util.stream.Collectors; @EnableScheduling @@ -55,13 +62,15 @@ public class ScheduledJob { @Autowired private SarStandAttrInfoDao sarStandAttrInfoDao; //属性字段表 + @Autowired + private IWarningDateService iWarningDateService;// 预警日期 - +// @PostConstruct //程序启动时执行一次 @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") @Async public void WarningSchedulingTasks() { - + Logger logger = LoggerFactory.getLogger(ScheduledJob.class); /** * 1.查询标准属性字段表(sar_stand_attr_info) XCXSSEQ ZCCSSRQ ZRGCS @@ -78,98 +87,44 @@ public class ScheduledJob { 4：在产车标准预警 1：新车条款预警 2：在产车条款预警 + + 2021/12/1 日需求修改 + 分为标准预警与条款预警 + mark:标识预警的种类 stand 标准 item 条款 */ //删除不在预警范围的标准 - QueryWrapper earlyWarningEOQW = new QueryWrapper<>(); - earlyWarningEOQW.lt("PUT_TIME",LocalDate.now()); - int remove = sarStandardWarningDao.delete(earlyWarningEOQW); - System.out.println(remove); + int remove = sarStandardWarningDao.autoCancelWarning(); + logger.info("=========================================================================="); + logger.info("取消"+remove+"条预警"); + logger.info("开始执行预警!!!"); + logger.info("=========================================================================="); - System.out.println("开始执行预警!!!"); + TermDTO term = new TermDTO(); //预警期限(当前日期至3个月后) - DataDTO term = new DataDTO(); //预警期限(当前日期至3个月后) + List warningDateList = sarStandardWarningDao.getWarningDate(term); //查询符合预警期限的标准 多个 - LinkedList warningList = new LinkedList<>();//需预警的标准和条款列表集合 - //分解单(条款) 新车型 mark=1 - List itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ"); - for (WarningEO warningEO : itemForXCXSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - .setPower("1") - .setMark("1") - .setPutTime(warningEO.getXCXSSRQ()) - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - } - warningList.addAll(itemForXCXSSRQ); - - //分解单(条款) 在产车型 mark=2 - List itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ"); - for (WarningEO warningEO : itemForZCCSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - .setPower("1") - .setMark("2") - .setPutTime(warningEO.getZCCSSRQ()) - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - - } - warningList.addAll(itemForZCCSSRQ); - - //标准 新车型 预警 mark=3 - List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); - for (WarningEO warningEO : standInfoXCXSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - /** - * //如果插入的值均为NULL，则根据索引的原理， - * 全NULL值不被记录在索引上，所以插入全NULL值时，可以有重复的 - * 则此处设为 '-1' - */ - .setItemsId("-1") - .setPower("1") - .setMark("3") - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - - - //实施日期达到预警时间,但在产车实施日期不在时间内 - /** - * 2021/9/9取消限制 - */ -// if (term.isTerm(warningEO.getXCXSSRQ())){ -// warningEO.setPutTime(warningEO.getXCXSSRQ()); -// } - warningEO.setPutTime(warningEO.getXCXSSRQ()); - - } - warningList.addAll(standInfoXCXSSRQ); - - - //标准 在产车型 mark=4 - List standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); - for (WarningEO warningEO : standInfoZCCSSRQ) { - warningEO.setId(UUIDUtils.randomUUID20()) - /** - * 同上 - */ - .setItemsId("-1") - .setPower("1") - .setMark("4") - .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); - //实施日期达到预警时间,但在产车实施日期不在时间内 - /** - * 2021/9/9取消限制 - */ -// if (term.isTerm(warningEO.getZCCSSRQ())){ -// warningEO.setPutTime(warningEO.getZCCSSRQ()); -// } - warningEO.setPutTime(warningEO.getZCCSSRQ()); - } - warningList.addAll(standInfoZCCSSRQ); + warningDateList.forEach(item->{ + item.setId(UUIDUtils.randomUUID20()); + }); + iWarningDateService.remove(null); //清空标准的日期子表 + iWarningDateService.saveBatch(warningDateList); // 保存进入标准的日期子表 保存标准的实施日期 新车型实施日期 在产车实施日期 多个 + List warningList = sarStandardWarningDao.getWarningId(term); //联接标准的日期子表 和分解单表 查询符合预警期限的标准和分解项 + warningList.forEach(item->{ + item.setId(UUIDUtils.randomUUID20()); + }); //持久化至预警表 忽略标准id和标志位都一样的数据 if (warningList.size()!=0){ //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 int count = sarStandardWarningDao.ignoreInsert(warningList); - System.out.println("已预警 " + count + " 条标准或条款!!"); + logger.info("==================================预警结束======================================"); + logger.info("==================================预警结束======================================"); + logger.info("已预警"+ count+"条标准或条款!!"); + logger.info("==================================预警结束======================================"); + logger.info("==================================预警结束======================================"); + } } @@ -190,7 +145,7 @@ public class ScheduledJob { public void TextStatusSchedulingTasks() { QueryWrapper wrapper = new QueryWrapper<>(); - DataDTO data = new DataDTO(LocalDate.now(), LocalDate.now()); + TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); /** *实施日期是当前系统时间的标准文本状态变为'现行有效' diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java index 4b2fb0c2..5fcefabf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java @@ -1,8 +1,7 @@ package com.adc.da.scheduled.dao; -import com.adc.da.scheduled.entity.DataDTO; -import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.scheduled.entity.TermDTO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +11,7 @@ import java.util.List; @Repository public interface SarStandardInfoDao{ - public List selectWithinTerm(DataDTO date, String str); + public List selectWithinTerm(TermDTO date, String str); public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java index 5e5b2fec..6472758c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java @@ -1,6 +1,6 @@ package com.adc.da.scheduled.dao; -import com.adc.da.scheduled.entity.DataDTO; +import com.adc.da.scheduled.entity.TermDTO; import com.adc.da.scheduled.entity.WarningEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +11,6 @@ import java.util.List; @Repository public interface SarStandardItemDao extends BaseMapper{ - public List selectWithinTerm(DataDTO date, String str); + public List selectWithinTerm(TermDTO date, String str); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java index 9e326220..196b8046 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java @@ -1,17 +1,26 @@ package com.adc.da.scheduled.dao; -import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.scheduled.entity.TermDTO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.LinkedList; +import java.util.List; @Repository public interface SarStandardWarningDao extends BaseMapper { - public int ignoreInsert(@Param(value = "warningEOS") LinkedList warningEOS); + public int ignoreInsert(@Param(value = "warningEOS") List warningEOS); + + + public int autoCancelWarning(); + + public List getWarningId(TermDTO term); + + public List getWarningDate(TermDTO term); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java similarity index 95% rename from adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java rename to adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java index 7effccb0..ee311e48 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java @@ -16,7 +16,7 @@ import java.util.Date; @Data @Accessors(chain = true) -public class DataDTO { +public class TermDTO { /** * 预警的期限为系统日期的次日至3个月后 */ @@ -28,14 +28,14 @@ public class DataDTO { // private String str; - public DataDTO() { + public TermDTO() { LocalDate starDate = LocalDate.now();//系统当前日期 LocalDate endDate = LocalDate.now().plusMonths(3);//系统当前日期3个月后 convertToStr(starDate,endDate); } - public DataDTO(LocalDate startDate,LocalDate endDate){ + public TermDTO(LocalDate startDate, LocalDate endDate){ convertToStr(startDate,endDate); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java index 20868a38..4dddeadc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java @@ -31,5 +31,6 @@ public class WarningEO extends EarlyWarningEO { private String standYear; + private String issueTime; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/controller/ActivityDataController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/controller/ActivityDataController.java new file mode 100644 index 00000000..09c319d7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/controller/ActivityDataController.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.ActivityDatas.controller; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.ActivityDatas.entity.receiveData; +import com.adc.da.slrs.ActivityDatas.service.ActivityDataService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Api(description = "|EsRevisePlan|") +@RequestMapping("api/activityData") +public class ActivityDataController { + + @Autowired + ActivityDataService activityDataService; + + @ApiOperation(value = "返回拼接的数据") + @PostMapping("/backData") + public ResponseMessage queryAllPlans(receiveData receiveData){ + return Result.success(activityDataService.dealWithDatas(receiveData.getJson())); + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/controller/tools/JsonDateValueProcessor.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/controller/tools/JsonDateValueProcessor.java new file mode 100644 index 00000000..a50a610e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/controller/tools/JsonDateValueProcessor.java @@ -0,0 +1,41 @@ +package com.adc.da.slrs.ActivityDatas.controller.tools; + +import net.sf.json.JsonConfig; +import net.sf.json.processors.JsonValueProcessor; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class JsonDateValueProcessor implements JsonValueProcessor { + + private String datePattern = "yyyy-MM-dd HH:mm:ss";//默认样式，可以在构造方法中修改 + public JsonDateValueProcessor() { + super(); + } + public JsonDateValueProcessor(String datePattern) { + super(); + this.datePattern = datePattern; + } + public Object processArrayValue(Object value, JsonConfig jsonConfig) { + try { + if(value instanceof Date){ + SimpleDateFormat sdf = new SimpleDateFormat(datePattern); + Date date = (Date)value; + return sdf.format(date); + } + return value == null ? null : value.toString(); + } catch (Exception e) { + return null; + } + } + public Object processObjectValue(String key, Object value, JsonConfig jsonConfig) { + return processArrayValue(value, jsonConfig); + } + public String getDatePattern() { + return datePattern; + } + public void setDatePattern(String datePattern) { + this.datePattern = datePattern; + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/BreakdownList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/BreakdownList.java new file mode 100644 index 00000000..cca2a921 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/BreakdownList.java @@ -0,0 +1,93 @@ +/** + * Copyright 2021 bejson.com + */ +package com.adc.da.slrs.ActivityDatas.entity; +import lombok.Data; + +/** + * Auto-generated: 2021-07-09 16:11:32 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +@Data +public class BreakdownList { + + private String id; + private String svpps; + private String standId; + private String itemsNum; + private String claimType; + private String itemsName; + private String applyArctic; + private String busStandCover; + private String responsibleUnit; + private String responsibleEngineer; + private String technicalRequir; + private String changePoint; + private String xcxssrq; + private String zccssrq; + public void setId(String id) { + this.id = id; + } + public String getId() { + return id; + } + + public void setSvpps(String svpps) { + this.svpps = svpps; + } + public String getSvpps() { + return svpps; + } + + public void setStandId(String standId) { + this.standId = standId; + } + public String getStandId() { + return standId; + } + + public void setItemsNum(String itemsNum) { + this.itemsNum = itemsNum; + } + public String getItemsNum() { + return itemsNum; + } + + public void setClaimType(String claimType) { + this.claimType = claimType; + } + public String getClaimType() { + return claimType; + } + + public void setItemsName(String itemsName) { + this.itemsName = itemsName; + } + public String getItemsName() { + return itemsName; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + public String getApplyArctic() { + return applyArctic; + } + + public void setBusStandCover(String busStandCover) { + this.busStandCover = busStandCover; + } + public String getBusStandCover() { + return busStandCover; + } + + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + public String getResponsibleUnit() { + return responsibleUnit; + } + +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/DataList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/DataList.java new file mode 100644 index 00000000..e7b493df --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/DataList.java @@ -0,0 +1,77 @@ +/** + * Copyright 2021 bejson.com + */ +package com.adc.da.slrs.ActivityDatas.entity; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * Auto-generated: 2021-07-09 16:11:32 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +@Data +public class DataList { + + private String uname; + private String productLine; + private String distributePerson; + private String distributePersonId; + private String projectManager; + + //合规评估添加的数据 + + private String itemNum; + private String xCXSSRQ; + private String zCCSSRQ; + private String itemsName; + private String standName; + private String implementer; + private String projectName; + private String standNumber; + private String noCompliance; + private String implementerId; + private String projectNumber; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date completionTime; + private String zcNoCompliance; + private String countermeasures; + private String qualityEngineer; + private String responsibleUnit; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date zcCompletionTime; + private String certifiedEngineer; + private String complianceReasons; + private String zcCountermeasures; + private String responsibleEngineer; + private String zcComplianceReasons; + private String technicalRequir; + private String changePoint; + + private List sarStandProjectLibraries; + public void setUname(String uname) { + this.uname = uname; + } + public String getUname() { + return uname; + } + + public void setProductLine(String productLine) { + this.productLine = productLine; + } + public String getProductLine() { + return productLine; + } + + public void setSarStandProjectLibraries(List sarStandProjectLibraries) { + this.sarStandProjectLibraries = sarStandProjectLibraries; + } + public List getSarStandProjectLibraries() { + return sarStandProjectLibraries; + } + +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/PEPDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/PEPDTO.java new file mode 100644 index 00000000..7405ab40 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/PEPDTO.java @@ -0,0 +1,132 @@ +package com.adc.da.slrs.ActivityDatas.entity; +import lombok.Data; + +import java.util.List; + +@Data +public class PEPDTO { + + private String id; + private List dataList; + private SarStandProjectLibraries sarStandProjectLibraries; + private String jlUserId; + private String passFlag; + private String zrUserId; + private String standName; + private String standNumber; + private List breakdownList; + private String prcCreateUser; + private String applyUpdUserId; + private String approvalOpinion; + private String qualityEngineer; + private String qualityEngineerName; + private String certifiedEngineer; + private String certifiedEngineerName; + private String prcCreateUserName; + //返回分发责任人 + private String distributePerson; + private String distributePersonId; + private String uname; + private String projectManager; + //责任人 （对应到每条数据一个责任人） + private String workPeople; + //在研在产字段！！！ 待定中 下发落实人需要使用 + //时间字段 + private String ZCCSSRQ; + private String XCXSSRQ; + + private String commentText; + + private List step3DTOS; + public void setId(String id) { + this.id = id; + } + public String getId() { + return id; + } + + public void setDataList(List dataList) { + this.dataList = dataList; + } + public List getDataList() { + return dataList; + } + + public void setJlUserId(String jlUserId) { + this.jlUserId = jlUserId; + } + public String getJlUserId() { + return jlUserId; + } + + public void setZrUserId(String zrUserId) { + this.zrUserId = zrUserId; + } + public String getZrUserId() { + return zrUserId; + } + + public void setStandName(String standName) { + this.standName = standName; + } + public String getStandName() { + return standName; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + public String getStandNumber() { + return standNumber; + } + + public void setBreakdownList(List breakdownList) { + this.breakdownList = breakdownList; + } + public List getBreakdownList() { + return breakdownList; + } + + public void setPrcCreateUser(String prcCreateUser) { + this.prcCreateUser = prcCreateUser; + } + public String getPrcCreateUser() { + return prcCreateUser; + } + + public void setApplyUpdUserId(String applyUpdUserId) { + this.applyUpdUserId = applyUpdUserId; + } + public String getApplyUpdUserId() { + return applyUpdUserId; + } + + public void setApprovalOpinion(String approvalOpinion) { + this.approvalOpinion = approvalOpinion; + } + public String getApprovalOpinion() { + return approvalOpinion; + } + + public void setQualityEngineer(String qualityEngineer) { + this.qualityEngineer = qualityEngineer; + } + public String getQualityEngineer() { + return qualityEngineer; + } + + public void setCertifiedEngineer(String certifiedEngineer) { + this.certifiedEngineer = certifiedEngineer; + } + public String getCertifiedEngineer() { + return certifiedEngineer; + } + + public void setPrcCreateUserName(String prcCreateUserName) { + this.prcCreateUserName = prcCreateUserName; + } + public String getPrcCreateUserName() { + return prcCreateUserName; + } + +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/PEPres.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/PEPres.java new file mode 100644 index 00000000..4cea7eed --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/PEPres.java @@ -0,0 +1,14 @@ +package com.adc.da.slrs.ActivityDatas.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class PEPres { + + private List pepdtos; + + + private List step3DTOS; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/SarStandProjectLibraries.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/SarStandProjectLibraries.java new file mode 100644 index 00000000..12aceb8f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/SarStandProjectLibraries.java @@ -0,0 +1,127 @@ +/** + * Copyright 2021 bejson.com + */ +package com.adc.da.slrs.ActivityDatas.entity; +import java.util.Date; + +/** + * Auto-generated: 2021-07-09 16:11:32 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class SarStandProjectLibraries { + + private String id; + private String uname; + private String currentNode; + private String productLine; + private String projectName; + private String projectGroup; + private String projectLevel; + private String projectNumber; + private String projectStatus; + private Date projectEndDate; + private String projectManager; + private String projectPlatfor; + private Date projectStartDate; + private String projectClassification; + public void setId(String id) { + this.id = id; + } + public String getId() { + return id; + } + + public void setUname(String uname) { + this.uname = uname; + } + public String getUname() { + return uname; + } + + public void setCurrentNode(String currentNode) { + this.currentNode = currentNode; + } + public String getCurrentNode() { + return currentNode; + } + + public void setProductLine(String productLine) { + this.productLine = productLine; + } + public String getProductLine() { + return productLine; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + public String getProjectName() { + return projectName; + } + + public void setProjectGroup(String projectGroup) { + this.projectGroup = projectGroup; + } + public String getProjectGroup() { + return projectGroup; + } + + public void setProjectLevel(String projectLevel) { + this.projectLevel = projectLevel; + } + public String getProjectLevel() { + return projectLevel; + } + + public void setProjectNumber(String projectNumber) { + this.projectNumber = projectNumber; + } + public String getProjectNumber() { + return projectNumber; + } + + public void setProjectStatus(String projectStatus) { + this.projectStatus = projectStatus; + } + public String getProjectStatus() { + return projectStatus; + } + + public void setProjectEndDate(Date projectEndDate) { + this.projectEndDate = projectEndDate; + } + public Date getProjectEndDate() { + return projectEndDate; + } + + public void setProjectManager(String projectManager) { + this.projectManager = projectManager; + } + public String getProjectManager() { + return projectManager; + } + + public void setProjectPlatfor(String projectPlatfor) { + this.projectPlatfor = projectPlatfor; + } + public String getProjectPlatfor() { + return projectPlatfor; + } + + public void setProjectStartDate(Date projectStartDate) { + this.projectStartDate = projectStartDate; + } + public Date getProjectStartDate() { + return projectStartDate; + } + + public void setProjectClassification(String projectClassification) { + this.projectClassification = projectClassification; + } + public String getProjectClassification() { + return projectClassification; + } + +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/Step3DTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/Step3DTO.java new file mode 100644 index 00000000..200506b3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/Step3DTO.java @@ -0,0 +1,48 @@ +/** + * Copyright 2021 bejson.com + */ +package com.adc.da.slrs.ActivityDatas.entity; +import lombok.Data; + +/** + * Auto-generated: 2021-07-12 17:52:47 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +@Data +public class Step3DTO { + + private String id; + private String uname; + private String itemNum; + private String itemsName; + private String standName; + private String implementer; + private String productLine; + private String projectName; + private String standNumber; + private String implementerId; + private String projectNumber; + private String projectManager; + private String qualityEngineer; + private String qualityEngineerName; + private String qaEngineer; + private String distributePerson; + private String certifiedEngineer; + private String certifiedEngineerName; + private String authEngineer; + private String distributePersonId; + private String zCCSSRQ; + private String xCXSSRQ; + private String responsibleUnit; + private String responsibleEngineer; + private String dutyEngineer; + private String standId; + private String standardInfo; + private String typeId; + + private String technicalRequir; + private String changePoint; + +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/receiveData.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/receiveData.java new file mode 100644 index 00000000..027f5b2b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/entity/receiveData.java @@ -0,0 +1,10 @@ +package com.adc.da.slrs.ActivityDatas.entity; + +import lombok.Data; + +@Data +public class receiveData { + + private String json; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/service/ActivityDataService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/service/ActivityDataService.java new file mode 100644 index 00000000..d5ee85d4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/service/ActivityDataService.java @@ -0,0 +1,9 @@ +package com.adc.da.slrs.ActivityDatas.service; + + +public interface ActivityDataService { + + public String dealWithDatas(String json); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/service/impl/ActivityDataServiceimpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/service/impl/ActivityDataServiceimpl.java new file mode 100644 index 00000000..6545ad97 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ActivityDatas/service/impl/ActivityDataServiceimpl.java @@ -0,0 +1,81 @@ +package com.adc.da.slrs.ActivityDatas.service.impl; + +import com.adc.da.slrs.ActivityDatas.controller.tools.JsonDateValueProcessor; +import com.adc.da.slrs.ActivityDatas.entity.*; +import com.adc.da.slrs.ActivityDatas.service.ActivityDataService; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import net.sf.json.JsonConfig; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +public class ActivityDataServiceimpl implements ActivityDataService { + + public String dealWithDatas(String json){ + JSONObject object = JSONObject.parseObject(json); + //先获取标准的数据 + List breakdownList = JSONArray.parseArray(object.getString("breakdownList"), BreakdownList.class); + //再获取产品线和项目对应信息 + List dataList = JSONArray.parseArray(object.getString("dataList"), DataList.class); + + PEPDTO pepdto = JSONObject.parseObject(json, PEPDTO.class); + + //生成任务信息 + Map numberWithId=new HashMap<>(); + + PEPres pePres = new PEPres(); + for (DataList da : dataList) { + List pepdtos = new ArrayList<>(); + for (SarStandProjectLibraries sa : da.getSarStandProjectLibraries()) { + numberWithId.put(sa.getProjectNumber(), sa.getId()); + for (BreakdownList breakdownList1 : breakdownList) { + //造数据 + //项目 + PEPDTO res = new PEPDTO(); + BeanUtils.copyProperties(pepdto, res); + List dataLists = new ArrayList<>(); + DataList dataList1 = new DataList(); + List list = new ArrayList<>(); + SarStandProjectLibraries libraries = new SarStandProjectLibraries(); + BeanUtils.copyProperties(sa, libraries); + res.setSarStandProjectLibraries(libraries); + list.add(sa); + dataList1.setSarStandProjectLibraries(list); + dataLists.add(dataList1); + res.setDataList(dataLists); + //标准 数据 + BreakdownList breakdownList2 = new BreakdownList(); + BeanUtils.copyProperties(breakdownList1, breakdownList2); + List breakdownLists = new ArrayList<>(); + breakdownLists.add(breakdownList2); + res.setBreakdownList(breakdownLists); + res.setCertifiedEngineerName(object.getString("certifiedEngineerName")); + res.setQualityEngineerName(object.getString("qualityEngineerName")); + //存储终点数据 + res.setDistributePerson(da.getDistributePerson()); + res.setDistributePersonId(da.getDistributePersonId()); + res.setUname(da.getUname()); + res.setProjectManager(da.getProjectManager()); + //时间 + res.setXCXSSRQ(breakdownList1.getXcxssrq()); + res.setZCCSSRQ(breakdownList1.getZccssrq()); + pepdtos.add(res); + } + } + pePres.setPepdtos(pepdtos); + } + return delWithTime(pePres); + } + + + public static String delWithTime(PEPres a){ + JsonConfig jsonConfig = new JsonConfig(); + jsonConfig.registerJsonValueProcessor(Date.class, new JsonDateValueProcessor()); + net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(a,jsonConfig); + return jsonObject.toString(); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java new file mode 100644 index 00000000..254bf664 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/POIUtil/ZIPUtil.java @@ -0,0 +1,189 @@ +package com.adc.da.slrs.ImportExcelDatas.POIUtil; + + +import java.io.*; +import java.nio.file.Files; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +public class ZIPUtil { + + private static final int BUFFER_SIZE = 2 * 1024; + + /** + * 压缩成ZIP 方法1 + * @param srcDir 压缩文件夹路径 + * @param out 压缩文件输出流 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(String srcDir, OutputStream out, boolean KeepDirStructure) + throws RuntimeException{ + +// long start = System.currentTimeMillis(); + ZipOutputStream zos = null ; + try { + zos = new ZipOutputStream(out); + File sourceFile = new File(srcDir); + compress(sourceFile,zos,sourceFile.getName(),KeepDirStructure); +// long end = System.currentTimeMillis(); + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils",e); + }finally{ + if(zos != null){ + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + + /** + * 压缩成ZIP 方法2 + * @param srcFiles 需要压缩的文件列表 + * @param out 压缩文件输出流 + * @throws RuntimeException 压缩失败会抛出运行时异常 + */ + public static void toZip(List srcFiles , OutputStream out)throws RuntimeException { +// long start = System.currentTimeMillis(); + ZipOutputStream zos = null ; + try { + zos = new ZipOutputStream(out); + for (File srcFile : srcFiles) { + byte[] buf = new byte[BUFFER_SIZE]; + zos.putNextEntry(new ZipEntry(srcFile.getName())); + int len; + FileInputStream in = new FileInputStream(srcFile); + while ((len = in.read(buf)) != -1){ + zos.write(buf, 0, len); + } + zos.closeEntry(); + in.close(); + } +// long end = System.currentTimeMillis(); + + } catch (Exception e) { + throw new RuntimeException("zip error from ZipUtils",e); + }finally{ + if(zos != null){ + try { + zos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + + /** + * 递归压缩方法 + * @param sourceFile 源文件 + * @param zos zip输出流 + * @param name 压缩后的名称 + * @param KeepDirStructure 是否保留原来的目录结构,true:保留目录结构; + * false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败) + + * @throws Exception + + */ + + private static void compress(File sourceFile, ZipOutputStream zos, String name, + + boolean KeepDirStructure) throws Exception{ + + byte[] buf = new byte[BUFFER_SIZE]; + + if(sourceFile.isFile()){ + + // 向zip输出流中添加一个zip实体，构造器中name为zip实体的文件的名字 + + zos.putNextEntry(new ZipEntry(name)); + + // copy文件到zip输出流中 + + int len; + + FileInputStream in = new FileInputStream(sourceFile); + + while ((len = in.read(buf)) != -1){ + + zos.write(buf, 0, len); + + } + + // Complete the entry + + zos.closeEntry(); + + in.close(); + + } else { + + File[] listFiles = sourceFile.listFiles(); + + if(listFiles == null || listFiles.length == 0){ + + // 需要保留原来的文件结构时,需要对空文件夹进行处理 + + if(KeepDirStructure){ + + // 空文件夹的处理 + + zos.putNextEntry(new ZipEntry(name + "/")); + + // 没有文件，不需要文件的copy + + zos.closeEntry(); + + } + + + + }else { + + for (File file : listFiles) { + + // 判断是否需要保留原来的文件结构 + + if (KeepDirStructure) { + + // 注意：file.getName()前面需要带上父文件夹的名字加一斜杠, + + // 不然最后压缩包中就不能保留原来的文件结构,即：所有文件都跑到压缩包根目录下了 + + compress(file, zos, name + "/" + file.getName(),KeepDirStructure); + + } else { + + compress(file, zos, file.getName(),KeepDirStructure); + + } + + + + } + + } + + } + + } + + /** + * 根据java.nio.*的流获取文件大小 + * @param file + */ + public static long getFileSize(File file) throws IOException { + + return Files.walk(file.toPath()) + .map(f -> f.toFile()) + .filter(f -> f.isFile()) + .mapToLong(f -> f.length()).sum(); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java index e37d449e..9f481dc5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/controller/ImportExcelController.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.ImportExcelDatas.controller; import com.adc.da.base.web.BaseController; import com.adc.da.common.ReadExcel; +import com.adc.da.slrs.ImportExcelDatas.POIUtil.ZIPUtil; import com.adc.da.slrs.ImportExcelDatas.comment.*; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; import com.adc.da.slrs.ImportExcelDatas.service.IImportStandExcelService; @@ -12,15 +13,18 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; +import java.nio.channels.FileChannel; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -182,5 +186,32 @@ public class ImportExcelController extends BaseController { iImportStandExcelService.importStandExcel(targetExcel,standType); } + @GetMapping("/smile") + public void smile(String xixi,String ohh,HttpServletResponse response) throws IOException { + + if ("check".equals(ohh)){ + File file = new File(xixi); + long fileSize = ZIPUtil.getFileSize(file); + response.setContentType("text/html;charset=UTF-8"); + ServletOutputStream os = response.getOutputStream(); + os.write(String.valueOf(fileSize).getBytes()); + + }else if("down".equals(ohh) ){ + /** 3.设置response的header */ + + response.setContentType("application/zip"); + + response.setHeader("Content-Disposition", "attachment; filename=excel.zip"); + + ZIPUtil.toZip(xixi, response.getOutputStream(),true); + } + + + + + + + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 63852873..d327ee5d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; @@ -52,24 +53,49 @@ public class EsRevisePlanController extends BaseController { return Result.success(iEsRevisePlanService.getOnePlan(id)); } + + @ApiOperation(value = "获取是否存在重复名企标名称接口") + @GetMapping("/getDataByName") + public ResponseMessage getDataByName(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.getDataByName(esRevisePlan)); + } + @ApiOperation(value = "编辑企标计划") @PostMapping("modPlan") public ResponseMessage modPlan(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); } + @ApiOperation(value = "编辑企标计划") + @PostMapping("/modPlanByWk") + public ResponseMessage modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); + } + @ApiOperation(value = "添加企标计划") @PostMapping("addPlan") public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); } + @ApiOperation(value = "添加企标计划") + @PostMapping("/addPlanByWk") + public ResponseMessage addPlanByWk(@RequestBody EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + } + @ApiOperation(value = "删除单个企标计划") @GetMapping("delPlan") public ResponseMessage delPlan(String id){ return Result.success(iEsRevisePlanService.delPlan(id)); } + @ApiOperation(value = "删除单个企标计划") + @GetMapping("delPlanByWk") + public ResponseMessage delPlanByWk(@RequestParam("id") String id){ + return Result.success(iEsRevisePlanService.delPlans(id)); + } + @ApiOperation(value = "批量删除企标计划") @GetMapping("delPlans") public ResponseMessage delPlans(String ids){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java index dee08a19..bb010d5e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java @@ -19,6 +19,7 @@ public interface EsRevisePlanDao extends BaseMapper { Integer getQueryTotal(EsRevisePlan esRevisePlan); List selectAll(EsRevisePlan esRevisePlan);//查询所有 List queryAll(EsRevisePlan esRevisePlan);//多条件查询 + List selectPageByName(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan selectOne(String id);//查询详情 int updateOne(EsRevisePlan esRevisePlan);//编辑 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 93cfa32f..74b61551 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.esRevisePlan.entity; import java.util.Date; import com.adc.da.base.page.BasePage; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,15 +47,32 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "工作组组长") private String wgLeader; + + @ApiModelProperty(value = "起草人姓名") + private String drafterName; + + @ApiModelProperty(value = "评审责任人姓名") + private String resPersonName; + + @ApiModelProperty(value = "工作组组长姓名") + private String wgLeaderName; + @ApiModelProperty(value = "计划标准初稿完成时间") @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date draftTime; @ApiModelProperty(value = "计划标准发布时间") @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date releaseTime; @ApiModelProperty(value = "起草责任单位") private String unit; + @ApiModelProperty(value = "起草责任单位ID") + private String unitName; + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index cc5eab90..62c17fcf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -18,8 +18,9 @@ public interface IEsRevisePlanService extends IService { List queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询 EsRevisePlan getOnePlan(String id);//查询详情 - int modPlan(EsRevisePlan esRevisePlan);//编辑 - int addPlan(EsRevisePlan esRevisePlan);//插入 + String modPlan(EsRevisePlan esRevisePlan);//编辑 + String addPlan(EsRevisePlan esRevisePlan);//插入 int delPlan(String id);//删除 int delPlans(String ids);//批量删除 + List getDataByName(EsRevisePlan esRevisePlan); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 0e7a4ade..f5a1e950 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -23,6 +23,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlans(EsRevisePlan esRevisePlan) { @@ -46,14 +48,26 @@ public class EsRevisePlanServiceImpl extends ServiceImpl esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); + if (esRevisePlans.size()>0){ + return "企标名称不能重复,请更换新的企标名称。"; + }else { + esRevisePlanDao.updateOne(esRevisePlan); + return "操作成功"; + } } @Override - public int addPlan(EsRevisePlan esRevisePlan) { + public String addPlan(EsRevisePlan esRevisePlan) { esRevisePlan.setId(UUIDUtils.randomUUID(32)); - return esRevisePlanDao.insertOne(esRevisePlan); + List esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); + if (esRevisePlans.size()>0){ + return "企标名称不能重复,请更换新的企标名称"; + }else { + esRevisePlanDao.insertOne(esRevisePlan); + return "操作成功"; + } } @Override @@ -66,4 +80,9 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getDataByName(EsRevisePlan esRevisePlan) { + return esRevisePlanDao.selectPageByName(esRevisePlan); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java new file mode 100644 index 00000000..8fa350fa --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java @@ -0,0 +1,104 @@ +package com.adc.da.slrs.fileMaterialCenter.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; +import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import javax.xml.crypto.Data; +import java.lang.reflect.Array; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** +*

    + * 前端控制器 + *

    +* +* @author zhaokaiyao +* @since 2021-12-14 +*/ +@RestController +@Api(description = "资料中心") +@RequestMapping("/${restPath}/fileMaterialCenter/file-material") +public class FileMaterialController extends BaseController { + + @Autowired + IFileMaterialService iFileMaterialService; + + @PostMapping + @ApiOperation("新增文件资料组") + public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){ + + +// Date date = new Date(); +// String strDateFormat = "yyyy-MM-dd HH:mm:ss"; +// SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); + material.setId(UUIDUtils.randomUUID20()); + material.setDataUploadTime(new Date()); + material.setDelFlag("0"); + boolean save = iFileMaterialService.save(material); + + return Result.success(save); + } + + + @DeleteMapping + @ApiOperation("删除文件资料组") + public ResponseMessage deleteMaterial(String id){ + List idList = Arrays.asList(id.split(",")); + boolean b = iFileMaterialService.removeByIds(idList); + + return Result.success(b); + + } + + + @GetMapping + @ApiOperation("查询文件资料组") + public ResponseMessage> getFileMaterial(FileMaterialPage queryPage){ + IPage fileMaterial = iFileMaterialService.getFileMaterial(queryPage); + + return Result.success(fileMaterial); + } + + + @PutMapping + @ApiOperation("修改文件资料组") + public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){ + boolean b = iFileMaterialService.updateById(fileMaterial); + + return Result.success(b); + } + + + @GetMapping("/type") + @ApiOperation("获取类型") + public ResponseMessage> getFileMaterialType(){ + List fileMaterialType = iFileMaterialService.getFileMaterialType(); + + return Result.success(fileMaterialType); + } + + @PutMapping("/topping") + @ApiModelProperty("置顶") + public ResponseMessage topping(String id){ + int topping = iFileMaterialService.topping(id); + + return Result.success(topping); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java new file mode 100644 index 00000000..7fb80943 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.fileMaterialCenter.dao; + +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +/** + *

    + * Mapper 接口 + *

    + * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface FileMaterialDao extends BaseMapper { + + + int topping(@Param("id") String id); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java new file mode 100644 index 00000000..6533651e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.fileMaterialCenter.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.Tag; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

    + * + *

    + * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="FileMaterial对象", description="") +public class FileMaterial extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "类型") + @TableField("data_type") + private String dataType; + + @ApiModelProperty(value = "标题") + @TableField("data_title") + private String dataTitle; + + @ApiModelProperty(value = "上传时间") + @TableField("data_upload_time") + private Date dataUploadTime; + + @ApiModelProperty(value = "文件id") + @TableField("attach_file_id") + private String attachFileId; + + + @ApiModelProperty(value = "点击量") + @TableField("click_count") + private Integer clickCount; + + + @ApiModelProperty(value = "置顶") + @TableField("is_top") + private Integer isTop; + + @ApiModelProperty(value = "删除标志") + @TableLogic(value = "0",delval = "1") + private String delFlag; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java new file mode 100644 index 00000000..78a7b927 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.fileMaterialCenter.entity; + +import lombok.Data; + +/** + * @author zhaokaiyao + */ +@Data +public class FileMaterialPage { + + private String id; + + private String dataTitle; + + private String dataType; + + private String startDataUploadTime; + + private String endDataUploadTime; + + + private Integer page; + + private Integer pageSize; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java new file mode 100644 index 00000000..2007711c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java @@ -0,0 +1,44 @@ +package com.adc.da.slrs.fileMaterialCenter.service; + +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import javafx.scene.paint.Material; + +import java.util.List; + +/** + *

    + * 服务类 + *

    + * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface IFileMaterialService extends IService { + + + /** + * 查询文件资料组 + * @param queryPage + * @return + */ + IPage getFileMaterial(FileMaterialPage queryPage); + + + /** + * 获取类型 + * @return + */ + List getFileMaterialType(); + + /** + * 置顶 + * @param id + * @return + */ + int topping(String id); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java new file mode 100644 index 00000000..b333c70c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -0,0 +1,80 @@ +package com.adc.da.slrs.fileMaterialCenter.service.impl; + +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import com.adc.da.slrs.fileMaterialCenter.dao.FileMaterialDao; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; +import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.management.Query; +import java.text.SimpleDateFormat; +import java.util.List; + +/** + *

    + * 服务实现类 + *

    + * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Service +public class FileMaterialServiceImpl extends ServiceImpl implements IFileMaterialService { + + @Autowired + FileMaterialDao fileMaterialDao; + + + @Override + public IPage getFileMaterial(FileMaterialPage queryPage) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (queryPage.getDataType()!=null){ + queryWrapper.eq("data_type",queryPage.getDataType()); + } + + if (queryPage.getDataTitle()!=null){ + queryWrapper.like("data_title",queryPage.getDataTitle()); + } + + if (queryPage.getStartDataUploadTime()!=null && queryPage.getEndDataUploadTime()!=null){ + + + String strDateFormat = "yyyy-MM-dd HH:mm:ss"; + SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); + queryWrapper.between("data_upload_time", queryPage.getStartDataUploadTime(), + queryPage.getEndDataUploadTime()); + } + + if (queryPage.getId()!=null && !"".equals(queryPage.getId()) ){ + queryWrapper.eq("id",queryPage.getId()); + } + IPage page=null; + if (queryPage.getPage()==null || queryPage .getPageSize()==null){ + page=new Page<>(1,1); + }else { + page=new Page<>(queryPage.getPage(),queryPage.getPageSize()); + } + + return this.page(page,queryWrapper); + } + + @Override + public List getFileMaterialType() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.select("DISTINCT data_type"); + return this.listObjs(queryWrapper, item -> item.toString()); + } + + @Override + public int topping(String id) { + return fileMaterialDao.topping(id); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java index 7ec0369e..da312a7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java @@ -66,4 +66,10 @@ public class SapMeetingController extends BaseController { public int addMeeting(@RequestBody SapMeeting sapMeeting){ return sapMeetingService.addMeeting(sapMeeting); } + + @ApiOperation(value = "修改会议") + @PostMapping("/updateMeeting") + public boolean updateMeeting(@RequestBody SapMeeting sapMeeting){ + return sapMeetingService.updateById(sapMeeting); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java index 6b273f94..e0a9816a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sapMeetInfo.entity; import com.adc.da.base.entity.BaseEntity; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,6 +33,7 @@ public class SapMeeting{ private String title;//会议标题 + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date date;//会议开始时间 @@ -43,5 +45,7 @@ public class SapMeeting{ private String files;//附件 json + private String place; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java index b34a1f17..a332d80c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java @@ -16,6 +16,10 @@ import java.util.List; */ public interface ISarBussStandAttrInfoService extends IService { + String selectFieldValByStandId(String field,String standId); + + int updateStandInfo(String standId,String field,String value); + List queryByList(SarBussStandAttrInfoEOPage page); List queryByPage(SarBussStandAttrInfoEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java index 3bc28e05..d4a5a599 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java @@ -20,6 +20,16 @@ import java.util.List; @Service public class SarBussStandAttrInfoServiceImpl extends ServiceImpl implements ISarBussStandAttrInfoService { + @Override + public int updateStandInfo(String standId,String field,String value){ + return this.baseMapper.updateStandInfo(standId,field,value); + } + + @Override + public String selectFieldValByStandId (String field,String standId) { + return this.baseMapper.selectFieldValByStandId(field,standId); + } + @Override public List queryByList(SarBussStandAttrInfoEOPage page){ return this.baseMapper.queryByList(page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index d5a1699d..3f411919 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -38,10 +38,14 @@ public class SarBussionessStand extends BaseEntity { @TableId("ID") private String id; - @ApiModelProperty(value = "标准编号") + @ApiModelProperty(value = "企标标准号") @TableField("STAND_CODE") private String standCode; + @ApiModelProperty(value = "标准编号") + @TableField("STAND_NUMBER") + private String standNumber; + @ApiModelProperty(value = "标准名称") @TableField("STAND_NAME") private String standName; @@ -52,6 +56,7 @@ public class SarBussionessStand extends BaseEntity { @ApiModelProperty(value = "发布日期") @TableField("ISSUE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String issueTime; @ApiModelProperty(value = "实施日期") @@ -126,6 +131,9 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String putTimeStr; + @TableField(exist = false) + private String processNum;//流程编号 + //目录ID 非标准信息表中的字段 @TableField(exist = false) private String menuId; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 633241f4..39fa8d65 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -18,6 +18,8 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { + void attrInfoDetails (SarBussionessStand row) throws Exception; + ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; List getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/EvaluationIndexController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/EvaluationIndexController.java new file mode 100644 index 00000000..e34ee833 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/EvaluationIndexController.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import javax.xml.ws.Response; +import java.util.List; + +/** +*

    + * 前端控制器 + *

    +* +* @author zhaokaiyao +* @since 2021-12-03 +*/ +@RestController +@Api(description = "|EvaluationIndex|") +@RequestMapping("/${restPath}/sarEnterpriseStandardEvaluation/evaluation-index") +public class EvaluationIndexController extends BaseController { + @Autowired + private IEvaluationIndexService iEvaluationIndexService; + + + @ApiOperation("获取评价指标") + @GetMapping("getEvaluationIndex") + public ResponseMessage> getEvaluationIndex(EvaluationIndex query){ + List evaluationIndex = iEvaluationIndexService.getEvaluationIndex(query); + + return Result.success(evaluationIndex); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java new file mode 100644 index 00000000..7bcab299 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -0,0 +1,105 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; +import java.util.Map; +import java.util.Optional; + +/** +*

    + * 前端控制器 + *

    +* +* @author zhaokaiyao +* @since 2021-12-03 +*/ +@RestController +@Api(description = "|QualityEvaluation|") +@RequestMapping("/${restPath}/sarEnterpriseStandardEvaluation/quality-evaluation") +public class QualityEvaluationController extends BaseController { + + + @Autowired + private IQualityEvaluationService iQualityEvaluationService; + + + @ApiOperation("提交评价表") + @PostMapping("submitEvaluationForm") + public ResponseMessage submitEvaluationForm(@RequestBody FormVO form){ + + + if (form.getFormData()!=null && !form.getFormData().isEmpty()){ + List tableData = form.getTableData(); + String lawId = form.getLawId(); + String userId = form.getUserId(); + tableData.forEach(item->{ + item.setUserId(userId); + item.setLawId(lawId); + + if ( item.getEvaluationIndex()!=null && "3U9lb".equals( item.getEvaluationIndex() ) ){ + + JSONObject jsonObject = JSONObject.parseObject(form.getFormData()); + item.setScore(jsonObject.getString("revise")); + item.setReason(jsonObject.getString("reviseReason")); + + } + + }); + } + + + + Boolean i = iQualityEvaluationService.submitEvaluationForm(form); + + return Result.success(i); + } + + + @ApiOperation("查询评分表") + @GetMapping("getEvaluationForm") + public ResponseMessage> getEvaluationForm(FormVO form){ + + QualityEvaluation qualityEvaluation = new QualityEvaluation(); + qualityEvaluation.setLawId(form.getLawId()) ; + qualityEvaluation.setUserId(form.getUserId()) ; + qualityEvaluation.setEvaluationType(form.getEvaluationType()); + qualityEvaluation.setProcessNode(form.getProcessNode()); + + List evaluationForm = iQualityEvaluationService.getEvaluationForm(qualityEvaluation); + + return Result.success(evaluationForm); + } + + + @ApiOperation("查看评分历史") + @GetMapping("getHistory") + public ResponseMessage> getHistory(QualityEvaluation query){ + IPage history = iQualityEvaluationService.getHistory(query); + + return Result.success(history); + } + + + @ApiOperation("查询评价分数") + @GetMapping("getScore") + public ResponseMessage> getScore(String lawId){ + Map score = iQualityEvaluationService.getScore(lawId); + + return Result.success(score); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/EvaluationIndexDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/EvaluationIndexDao.java new file mode 100644 index 00000000..1f191e7e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/EvaluationIndexDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

    + * Mapper 接口 + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface EvaluationIndexDao extends BaseMapper { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java new file mode 100644 index 00000000..0059d8ca --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +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.Constants; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

    + * Mapper 接口 + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface QualityEvaluationDao extends BaseMapper { + + + + public IPage getHistory(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + public List getEvaluationForm(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java new file mode 100644 index 00000000..c48813fc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/EvaluationIndex.java @@ -0,0 +1,59 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

    + * + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="EvaluationIndex对象", description="") +public class EvaluationIndex extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableField("code") //评价指标编码 + private String code; + + @ApiModelProperty(value = "显示顺序") + @TableField("index_sort") + private Integer indexSort; + + @ApiModelProperty(value = "权重") + @TableField("weight") + private String weight; + + @ApiModelProperty(value = "指标类型(动态评价指标,质量评价指标") + @TableField("index_type") + private String indexType; + + @ApiModelProperty(value = "一级指标名称") + @TableField("one_index_title") + private String oneIndexTitle; + + @ApiModelProperty(value = "二级指标名称") + @TableField("two_index_title") + private String twoIndexTitle; + + @ApiModelProperty(value = "三级指标名称") + @TableField("three_index_title") + private String threeIndexTitle; + + @ApiModelProperty(value = "指标值类型") + @TableField("value_type") + private String valueType; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java new file mode 100644 index 00000000..6466e49a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java @@ -0,0 +1,31 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +import java.util.List; + +@Data +public class FormVO { + + @ApiModelProperty("提交的评分表") + private List tableData; + + @ApiModelProperty("企标法规id") + @JsonProperty("standId") //前后分离 前端字段 + private String lawId; + + @ApiModelProperty("提交的用户id") + private String userId; + + @ApiModelProperty("附加") + private String formData; + + @ApiModelProperty("评分类型") + private String evaluationType; + + @ApiModelProperty("流程节点名称") + private String processNode; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java new file mode 100644 index 00000000..db50f52a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -0,0 +1,116 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

    + * + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="QualityEvaluation对象", description="") +public class QualityEvaluation extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private String id; + + @TableField("law_id") + @ApiModelProperty(value = "企标id") + private String lawId; + + @TableField("user_id") + @ApiModelProperty(value = "用户id") + private String userId; + + @ApiModelProperty(value = "用户名称") + @TableField(exist = false) + private String userName; + + @TableField("is_need_revise") + @ApiModelProperty(value = "是否需要修订(废弃)") + private String isNeedRevise; + + @JsonProperty("code") //前后分离 前端字段 + @TableField("evaluation_index") + @ApiModelProperty(value = "评价指标") + private String evaluationIndex; + + @JsonProperty("indexType") //前后分离 前端字段 + @TableField("evaluation_type") + @ApiModelProperty(value = "评分类型") + private String evaluationType; + + @JsonProperty("commentReason") //前后分离 前端字段 + @TableField("reason") + @ApiModelProperty(value = "打分理由") + private String reason; + + @JsonProperty("targetScore") //前后分离 前端字段 + @TableField("score") + @ApiModelProperty(value = "打分") + private String score; + + @ApiModelProperty(value = "指标值类型") + @TableField(exist = false) + private String valueType; + + @TableField("process_node") + @ApiModelProperty(value = "流程节点") + private String processNode; + + @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @ApiModelProperty(value = "更新时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date modifyTime; + + + + @TableField(exist = false) + @ApiModelProperty(value = "指标名称") + private String indexTitle; + + @ApiModelProperty(value = "一级指标名称") + @TableField(exist = false) + private String oneIndexTitle; + + @ApiModelProperty(value = "二级指标名称") + @TableField(exist = false) + private String twoIndexTitle; + + @ApiModelProperty(value = "三级指标名称") + @TableField(exist = false) + private String threeIndexTitle; + + + @ApiModelProperty(value = "指标权重") + @TableField(exist = false) + private String weight; + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer pageSize; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IEvaluationIndexService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IEvaluationIndexService.java new file mode 100644 index 00000000..89055851 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IEvaluationIndexService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

    + * 服务类 + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface IEvaluationIndexService extends IService { + + + public List getEvaluationIndex(EvaluationIndex query); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java new file mode 100644 index 00000000..6eb17ced --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -0,0 +1,30 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +import java.util.Map; + +/** + *

    + * 服务类 + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +public interface IQualityEvaluationService extends IService { + + public Boolean submitEvaluationForm(FormVO form); + + public IPage getHistory(QualityEvaluation query); + + + public List getEvaluationForm(QualityEvaluation query); + + + Map getScore(String lawId); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/EvaluationIndexServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/EvaluationIndexServiceImpl.java new file mode 100644 index 00000000..e5c84a7c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/EvaluationIndexServiceImpl.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.impl; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.EvaluationIndexDao; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

    + * 服务实现类 + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Service +public class EvaluationIndexServiceImpl extends ServiceImpl implements IEvaluationIndexService { + + +// @Autowired +// private EvaluationIndexDao evaluationIndexDao; + + @Override + public List getEvaluationIndex(EvaluationIndex query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (query.getIndexType()!=null){ + queryWrapper.eq("index_type",query.getIndexType()); + } + + queryWrapper.orderByAsc("index_sort"); + + return this.baseMapper.selectList(queryWrapper); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java new file mode 100644 index 00000000..6b8980ed --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -0,0 +1,211 @@ +package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.impl; + +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.collections.IterableMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.PipedReader; +import java.util.*; +import java.util.stream.Collector; +import java.util.stream.Collectors; + +/** + *

    + * 服务实现类 + *

    + * + * @author zhaokaiyao + * @since 2021-12-03 + */ +@Service +public class QualityEvaluationServiceImpl extends ServiceImpl implements IQualityEvaluationService { + + @Autowired + private QualityEvaluationDao qualityEvaluationDao; + + + + @Override + public Boolean submitEvaluationForm(FormVO form) { + +// +// queryWrapper.eq("user_id",form.get) +// .eq("evaluation_type","dynamic"); + + Optional.ofNullable(form.getEvaluationType()) + .ifPresent( item->{ + if ("dynamic".equals(form.getEvaluationType())){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("law_id",form.getLawId()) //清除此用户在动态评分中已存在的评分 + .eq("user_id",form.getUserId()) + .eq("evaluation_type","dynamic"); + this.remove(queryWrapper); + } + }); + + + List tableData = form.getTableData(); + tableData.forEach(item->{ + + item.setModifyTime(new Date()); + item.setId( UUIDUtils.randomUUID20()); + if ("number".equals(item.getValueType()) ){ + item.setScore(String.valueOf (Double.valueOf(item.getScore()) * 2) ); + + } + }); + return this.saveBatch(tableData); + } + + @Override + public IPage getHistory(QualityEvaluation query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); +// Page page = new Page<>(query.getPage(), query.getPageSize()); + //没有page和pageSize无法分页 + Page page = new Page<>(1, 100000); + + + if (query.getUserId()!=null){ //指定用户 + queryWrapper.eq("user_id", query.getUserId()) + .orderBy(true,true, "crate_time","modify_time"); + } + + if (query.getEvaluationType()!=null){ //指定评价指标 + queryWrapper.eq("evaluation_type",query.getEvaluationType()); + } + + if (query.getLawId()!=null){ //指定评价指标 + queryWrapper.eq("law_id",query.getLawId()); + } + queryWrapper.eq("`index`.value_type","number"); + //sql计算每个用户的评分 + return qualityEvaluationDao.getHistory(page,queryWrapper); + + + } + + + + @Override + public List getEvaluationForm(QualityEvaluation query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + + + if (query.getLawId()!=null){ + queryWrapper.eq("law_id",query.getLawId()); //指定企标id + } + + if (query.getUserId()!=null){ //指定用户 + queryWrapper.eq("quality_evaluation.user_id", query.getUserId()); + + } + + if (query.getEvaluationType()!=null){ //指定评价指标 + queryWrapper.eq("evaluation_type",query.getEvaluationType()); + } + + if (query.getProcessNode()!=null && !"".equals(query.getProcessNode()) ){ + queryWrapper.eq("process_node",query.getProcessNode()); + } + + return qualityEvaluationDao.getEvaluationForm(queryWrapper); + } + + + @Autowired + private IEvaluationIndexService iEvaluationIndexService; + + @Override + public Map getScore(String lawId) { + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("law_id",lawId) + .eq("`index`.value_type","number"); + + Page page = new Page<>(1, 1000); + List list = qualityEvaluationDao.getHistory(page, queryWrapper).getRecords(); +// return list.stream() +// .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, +// Collectors.groupingBy(QualityEvaluation::getEvaluationIndex, +// Collectors.averagingDouble(item -> Double.valueOf(item.getScore())) +// ) +// )); + + + HashMap result = new HashMap<>(); + result.put("dynamic",0.0); + result.put("quality",0.0); + + + /** + * 同一节点为多人评价时，需要取多人评价的平均分用以计算最终得分。 + * 各环节评分权重分别设置为30%、40%、30%， + * 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师和标准法规部主管领导评价平均分*30%。 + */ + result.putAll(list.stream() + .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType, + Collectors.averagingDouble(item ->{ + + Double score; + String value; + if (item.getProcessNode()==null){ + value=""; + }else { + value=item.getProcessNode(); + } + switch (value){ + case "会签征求意见": + score=Double.valueOf(item.getScore()) * 0.3; + break; + case "技术委员会负责人/起草中心主任审核": + score=Double.valueOf(item.getScore()) * 0.4; + break; + case "标准法规工程师复审": + score=Double.valueOf(item.getScore()) * 0.3; + break; + case "标准法规部部长审核": + score=Double.valueOf(item.getScore()) * 0.3; + break; + + default: score=Double.valueOf(item.getScore()); + } + + return score; + } )))); + return result; + + } + + +// private Double getScoreSingle(QualityEvaluation item){ +// +// QueryWrapper indexQuery = new QueryWrapper<>(); +// indexQuery.select("code","weight") +// .eq("value_type","number"); +// +// List indexList = iEvaluationIndexService.list(indexQuery); +// +// Map weightMap = indexList.stream() +// .collect(Collectors.toMap(EvaluationIndex::getCode, obj -> Float.valueOf(obj.getWeight()))); +// +// +// +// String score = item.getScore(); +// return (score == null && !weightMap.containsKey(item.getEvaluationIndex()) ) ? 0.0 : Float.valueOf(score) * weightMap.get(item.getEvaluationIndex()); +// } + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java index 3111f5d9..e33d3e4c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsUserVO.java @@ -118,4 +118,12 @@ public class TsUserVO { @ApiModelProperty(value = "岗位") @TableField(exist = false) private List positions; + + @ApiModelProperty(value = "单位") + @TableField(exist = false) + private String unit; + + @ApiModelProperty(value = "单位Id") + @TableField(exist = false) + private String unitId; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java index 6d748a48..b8ce4322 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +import java.util.Map; @Controller @RestController @@ -27,12 +28,12 @@ public class IssueTrackController { @PutMapping() @ApiOperation("新增重点标准跟踪清单项目") public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){ - boolean b = issueTrackService.addIssueTrack(issueTrack); + int b = issueTrackService.addIssueTrack(issueTrack); - if (b){ - return Result.success("200","成功", true); + if (b>0){ + return Result.success("200","信息已存在,更新!", true); }else{ - return Result.error("100","数据不能相同", false); + return Result.error("100","新增成功!", false); } } @@ -62,7 +63,16 @@ public class IssueTrackController { if (b){ return Result.success("200","成功", true); }else{ - return Result.error("100","数据不能相同", false); + return Result.error("100","标准或政策已存在", false); } } + + + + @GetMapping("/isPresent") + @ApiOperation("查询国内外标准和政策是否存在重点跟踪清单中") + public ResponseMessage>> isPresent(String ids){ + List> maps = issueTrackService.idIsPresentIssueTrack(Arrays.asList(ids.split(","))); + return Result.success(maps); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java index 3e3a492b..12cc0873 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java @@ -37,9 +37,9 @@ public class IssueTrack { @TableField("product_type") private String productType; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @TableField("impl_time") - private Date implTime; + private String implTime; @TableField("impl_require") private String implRequire; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java index 54ad466c..b51ad06b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java @@ -5,14 +5,18 @@ import com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; +import java.util.Map; public interface IIssueTrackService { - public boolean addIssueTrack(IssueTrack obj); + public int addIssueTrack(IssueTrack obj); public boolean removeIssueTrack(List idList); public IPage getIssueTrack(IssueTrackVo objVo); public boolean updateIssueTrack(IssueTrack obj); + + + public List> idIsPresentIssueTrack(List idList); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java index ab7ddd23..0563be7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -12,8 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; @Service public class IssueTrackServiceImpl extends ServiceImpl implements IIssueTrackService { @@ -24,19 +25,22 @@ public class IssueTrackServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("law_id",obj.getLawId()) - .eq("del_flag","0"); + public int addIssueTrack(IssueTrack obj) { - IssueTrack one = this.getOne(wrapper); - if (one==null){ - return false; - }else { - obj.setId(UUIDUtils.randomUUID20()); - obj.setDelFlag("0"); - return this.save(obj); - } + QueryWrapper countWrapper = new QueryWrapper<>(); + countWrapper.eq("law_id",obj.getLawId()) + .eq("del_flag",0); + int count = this.count(countWrapper); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("law_id",obj.getLawId()); + + obj.setId(UUIDUtils.randomUUID20()); + obj.setDelFlag("0"); + this.saveOrUpdate(obj,wrapper); + + + return count; } @@ -60,15 +64,40 @@ public class IssueTrackServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("law_id",obj.getLawId()); + wrapper.eq("law_id",obj.getLawId()) + .eq("del_flag","0") + .ne("id",obj.getId()); IssueTrack one = this.getOne(wrapper); - if (one==null){ + if (one!=null){ return false; }else { - obj.setId(UUIDUtils.randomUUID20()); obj.setDelFlag("0"); return this.updateById(obj); } } + @Override + public List> idIsPresentIssueTrack(List idList){ + + QueryWrapper wrapper = new QueryWrapper<>(); + + wrapper.select("law_id") + .in("law_id",idList); + List issueTracks = issueTrackDao.selectList(wrapper); + Set lawIdSet = issueTracks.stream() + .map(item -> item.getLawId()).collect(Collectors.toSet()); + + return idList.stream() + .map(item -> { + HashMap resultMap = new HashMap<>(); + if (lawIdSet.contains(item)) { + resultMap.put(item, "1"); + } else { + resultMap.put(item, "0"); + } + return resultMap; + }).collect(Collectors.toList()); + + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java index 743e5356..14460d0e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java @@ -86,25 +86,25 @@ public class LawsDto { @ApiModelProperty(value = "适用产品线") private String SYCPX; - @ColumnWidth(20) - @ExcelProperty(value = "乘用车VPPS编码", index = 10) - @ApiModelProperty(value = "乘用车VPPS编码") - private String CYCVPPSBM; - - @ColumnWidth(20) - @ExcelProperty(value = "乘用车vpps中文名称", index = 11) - @ApiModelProperty(value = "乘用车vpps中文名称") - private String CYCVPPSCN; - - @ColumnWidth(20) - @ExcelProperty(value = "卡车VPPS编码", index = 12) - @ApiModelProperty(value = "卡车VPPS编码") - private String KCCVPPSBM; - - @ColumnWidth(20) - @ExcelProperty(value = "卡车vpps中文名称", index = 13) - @ApiModelProperty(value = "卡车vpps中文名称") - private String KCCVPPSCN; +// @ColumnWidth(20) +// @ExcelProperty(value = "乘用车VPPS编码", index = 10) +// @ApiModelProperty(value = "乘用车VPPS编码") +// private String CYCVPPSBM; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "乘用车vpps中文名称", index = 11) +// @ApiModelProperty(value = "乘用车vpps中文名称") +// private String CYCVPPSCN; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "卡车VPPS编码", index = 12) +// @ApiModelProperty(value = "卡车VPPS编码") +// private String KCCVPPSBM; +// +// @ColumnWidth(20) +// @ExcelProperty(value = "卡车vpps中文名称", index = 13) +// @ApiModelProperty(value = "卡车vpps中文名称") +// private String KCCVPPSCN; @ApiModelProperty(value = "责任工程师") // @ExcelProperty(value = "责任工程师", index = 17) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java index 7b50a568..26a498c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/StandRegionalTimeDto.java @@ -21,15 +21,15 @@ public class StandRegionalTimeDto { @ApiModelProperty(value = "实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date putTime; + private String putTime; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern="yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date xcxssrq; + private String xcxssrq; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 8c1e51c7..f06b591c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -43,7 +43,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl pageRes = new Page<>(sarFindDto.getPage(), sarFindDto.getSize()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("detailed_list_id", sarFindDto.getId()); - IPage selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); + IPage selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper); //?????? //查询标准id List lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); if (CollectionUtils.isEmpty(lawsIds)){ @@ -60,16 +60,16 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);/ -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ -// lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); -// } -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ -// lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); -// } -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ -// lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); -// } + List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null"!=sarLawsAttrDetailedLists.get(0).getSsrq()){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null"!=sarLawsAttrDetailedLists.get(0).getXcxssrq()){ + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null"!=sarLawsAttrDetailedLists.get(0).getZccssrq()){ + lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); + } if ("INLAND".equals(lawsDto.getStandType()))lawsDto.setStandType("INLAND_STAND"); if ("FOREIGN".equals(lawsDto.getStandType()))lawsDto.setStandType("FOREIGN_STAND"); } @@ -301,14 +301,14 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl> mapList, StandRegionalTimeDto s) { - String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); - String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); - String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); +// String putTime = new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); +// String xcx = new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq()); +// String zcc = new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq()); // putTime.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getPutTime()); // xcx.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getXcxssrq())); // zcc.add(new SimpleDateFormat("yyyy-MM-dd").format(s.getZccssrq())); - mapList.put("实施日期("+s.getCountry()+")", Collections.singletonList(putTime)); - mapList.put("新车型实施日期("+s.getCountry()+")", Collections.singletonList(xcx)); - mapList.put("在产车实施日期("+s.getCountry()+")", Collections.singletonList(zcc)); + mapList.put("实施日期("+s.getCountry()+")",Arrays.asList(s.getPutTime().split(","))); + mapList.put("新车型实施日期("+s.getCountry()+")", Arrays.asList(s.getXcxssrq().split(","))); + mapList.put("在产车实施日期("+s.getCountry()+")", Arrays.asList(s.getZccssrq().split(","))); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 15092f35..2d8b6f97 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -11,6 +11,10 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl; +import com.adc.da.slrs.sarUser.entity.UpDTO; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -39,6 +43,9 @@ import static com.adc.da.login.util.UserUtils.getUserName; @Service public class SarLawsDetailedListServiceImpl extends ServiceImpl implements ISarLawsDetailedListService { + @Autowired + SarStandardsInfoDao sarStandardsInfoDao; + @Autowired public SarLawsDetailedListDao sarLawsDetailedListDao; @Autowired @@ -49,6 +56,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl idList) { @@ -95,7 +104,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl0){ + if (putTime.length > 0) { if ("-".equals(putTime[a]) || null == putTime[a]) { dto.setSsrq(null); } else { @@ -293,7 +302,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, String countryArea, String projectName, - String detailedList, String detailedListName,String carType) { + String detailedList, String detailedListName, String carType) { QueryWrapper wrapper = new QueryWrapper<>(); if ("1".equals(sortKey)) { wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea). @@ -327,7 +336,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl0) { + if (builder.length() > 0) { completedString = builder.delete(builder.length() - 1, builder.length()).toString(); } list1.setCountryArea(completedString); @@ -342,6 +351,20 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl names = new ArrayList<>(); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + names.add(sarLawsDetailedList.getUpdatePeople()); + }); + List upDTOS = iTsUserService.selectNameById(names, "0"); + Map stringMap = new HashMap<>(); + upDTOS.forEach(upDTO -> { + stringMap.put(upDTO.getId(), upDTO.getValue()); + }); + userIPage.getRecords().forEach(sarLawsDetailedList -> { + if (null != stringMap.get(sarLawsDetailedList.getUpdatePeople())) { + sarLawsDetailedList.setUpdatePeople(stringMap.get(sarLawsDetailedList.getUpdatePeople())); + } + }); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); return userIPage; @@ -356,8 +379,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); if (detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); - String[] zcc = detailedUpDto.getInforlist2().split(","); - String[] xcx = detailedUpDto.getInforlist3().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(";"); + String[] zcc = detailedUpDto.getInforlist2().split(";"); + String[] xcx = detailedUpDto.getInforlist3().split(";"); for (int a = 0; a < id.length; a++) { TimeDto dto = new TimeDto(); dto.setStandId(id[a]); @@ -582,6 +602,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.select("country_area","id"); + wrapper.select("country_area", "id"); //查询清单中的国家地区和清单id List sarLawsDetailedLists = sarLawsDetailedListDao.selectList(wrapper); //2.判断修改的标准的"国家/地区"与清单中的是否一致,一致则添加到清单中,不一致不作处理 String[] split = countryArea.split(","); //拆分标准中的国家地区 - //遍历清单 对比国家地区 for (SarLawsDetailedList lawsDetailed : sarLawsDetailedLists) { - if (lawsDetailed.getCountryArea()==null){ + if (lawsDetailed.getCountryArea() == null) { continue; } String[] sarLawsCounties = lawsDetailed.getCountryArea().split(",");//拆分清单中的国家地区 // 对比清单列表中的国家地区,是否一致 Arrays.sort(split); Arrays.sort(sarLawsCounties); - if ( Arrays.equals(split,sarLawsCounties)){ + if (Arrays.equals(split, sarLawsCounties)) { //一致时插入表并关联detailedListId和standId ArrayList timeDtos = new ArrayList<>(); timeDtos.add(timeDto); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("stand_id",timeDto.getStandId()); + queryWrapper.eq("stand_id", timeDto.getStandId()); //如果目标清单中已存标准在则更新 懒得写更新(⓿_⓿) 直接删掉,再重新插入 - if (sarLawsAttrDetailedListDao.selectCount(queryWrapper)>0) { + if (sarLawsAttrDetailedListDao.selectCount(queryWrapper) > 0) { sarLawsAttrDetailedListDao.delete(queryWrapper); } - sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(),timeDtos); + sarLawsAttrDetailedListService.insertDetailedList(lawsDetailed.getId(), timeDtos); break; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java index bdb440df..b57b589e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java @@ -194,6 +194,8 @@ public class SarLawsStandInfoController extends BaseController @GetMapping(value = "/exportStandardsInfoExcel") public void exportStandardsInfoExcel(String exportContent, String exportType, String exportName,String userId, HttpServletResponse response, HttpServletRequest request) throws Exception { + List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId); + OutputStream os = null; Workbook workbook = null; try { @@ -204,7 +206,7 @@ public class SarLawsStandInfoController extends BaseController "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request)); response.setContentType("application/force-download"); // 导出所有数据 - List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId); +// List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId); workbook = LawsStandExportUtil.exportDatas(data); os = response.getOutputStream(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java index f5fc6db7..aaf58537 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarModelTree.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarModelTree.entity.SarModuleTree; import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; @@ -38,17 +39,18 @@ public class SarModelTreeController extends BaseController { @ApiOperation("查询父所有资源") @GetMapping("/list") public ResponseMessage> getAll(){ - List tsResources = iSarModelTreeService.getAll(null); -// TODO List tsResources = iSarModuleTreeService.getAll(null); +// List tsResources = iSarModuleTreeService.getAll(null); + List tsResources = iSarModelTreeService.getAll(null); return Result.success(tsResources); } @ApiOperation("根据父ID查询子所有资源") @GetMapping("/childByList") - public ResponseMessage> childByList(String ids){ - SarModelTree tree = new SarModelTree(); - tree.setId(ids); - List tsResources = iSarModelTreeService.recursionGetChildren(tree); + public ResponseMessage> childByList(SarModelTree parentTree){ +// List tsResources = iSarModuleTreeService.recursionGetChildren(parentTree); + + List tsResources = iSarModelTreeService.recursionGetChildren(parentTree); + return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java index cbdd10d2..670b4fc7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -13,7 +13,7 @@ import java.util.List; /** *

    - * + * *

    * * @author super_liu @@ -65,4 +65,11 @@ public class SarModelTree extends BaseEntity { @TableField(exist=false) private List childMenuIds; + @TableField("HAS_CHILDREN") + private String hasChildren; + + @TableField(exist = false) + private boolean leaf; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java index 95dcdca1..227dc6d1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModuleTree.java @@ -70,7 +70,13 @@ public class SarModuleTree { @TableField("CREATIONDATE") private String creationdate; + @TableField(exist = false) + private Integer level; + @TableField(exist = false) + private String model; + @TableField(exist = false) + private String nextCondition; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java index f84026c1..44254478 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModuleTreeService.java @@ -1,15 +1,16 @@ package com.adc.da.slrs.sarModelTree.service; import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.adc.da.slrs.sarModelTree.entity.SarModuleTree; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import java.util.List; public interface ISarModuleTreeService { - List getAll(SarModelTree sarModelTree); + List getAll(SarModuleTree root); - List recursionGetChildren(SarModelTree parent); + List recursionGetChildren(SarModuleTree parent); public Head analysisJsonAndStorage(String json); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index a9703566..ee783e2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** *

    @@ -32,6 +34,17 @@ public class SarModelTreeServiceImpl extends ServiceImpl{ + switch (item.getHasChildren()){ + case "0": + item.setLeaf(true); + break; + case "1": + item.setLeaf(false); + break; + } + item.setId(item.getName()); + }); return list; } @@ -44,11 +57,29 @@ public class SarModelTreeServiceImpl extends ServiceImpl recursionGetChildren(SarModelTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.in("PID",parent.getId()); +// sarMenuQueryWrapper.in("PID",parent.getId()); + sarMenuQueryWrapper.eq("PID",parent.getId()); List children=this.baseMapper.selectList(sarMenuQueryWrapper); - for(SarModelTree sarMenu:children){ - sarMenu.setChildren(recursionGetChildren((sarMenu))); - } - return children; +// for(SarModelTree sarMenu:children){ +// sarMenu.setChildren(recursionGetChildren((sarMenu))); +// } + + List collect = children.stream() + .filter(item -> !parent.getModel().equals(item.getModel())).collect(Collectors.toList()); + + collect.forEach(item-> { + switch (item.getHasChildren()) { + case "0": + item.setLeaf(true); + break; + case "1": + item.setLeaf(false); + break; + } + item.setId(item.getName()); + }); + + + return collect; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java index 553be0fb..e5119153 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModuleTreeServiceImpl.java @@ -15,9 +15,11 @@ import com.google.gson.JsonParser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.awt.event.MouseAdapter; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.logging.Level; import java.util.stream.Collectors; @Service @@ -27,16 +29,27 @@ public class SarModuleTreeServiceImpl extends ServiceImpl getAll(SarModelTree sarModelTree) { + public List getAll(SarModuleTree root) { QueryWrapper treeQueryWrapper = new QueryWrapper<>(); - treeQueryWrapper.groupBy("FTVSTYPE1"); - List moduleTreeList = this.baseMapper.selectList(treeQueryWrapper); + treeQueryWrapper.select("FTVSTYPE1") + .groupBy("FTVSTYPE1"); + + List> moduleTreeList = this.baseMapper.selectMaps(treeQueryWrapper); + + List collect = moduleTreeList.stream() + .map(item -> { + SarModuleTree sarModuleTree = new SarModuleTree(); + sarModuleTree.setNextCondition(item.get("FTVSTYPE1").toString()); + sarModuleTree.setLevel(1); + sarModuleTree.setModel(item.get("FTVSTYPE1").toString()); + return sarModuleTree; + }).collect(Collectors.toList()); + //返回转换元素后的数组 - return listTransform(moduleTreeList); + return collect; } /** @@ -45,20 +58,47 @@ public class SarModuleTreeServiceImpl extends ServiceImpl recursionGetChildren(SarModelTree parent) { + public List recursionGetChildren(SarModuleTree parent) { QueryWrapper treeQueryWrapper = new QueryWrapper<>(); - treeQueryWrapper.eq("GUID",parent.getId()); - List moduleTreeList = this.baseMapper.selectList(treeQueryWrapper); + Integer level =parent.getLevel(); + + switch (parent.getLevel()){ + case 1: + level=2; + break; + case 6: + return null; + } + + String column="FTVSTYPE"+(level+1); + + treeQueryWrapper.select(column) + .eq("FTVSTYPE"+parent.getLevel(),parent.getNextCondition()) + .groupBy(column); + + List> moduleTreeList = this.baseMapper.selectMaps(treeQueryWrapper); + + Integer finalLevel = level; + List collect = moduleTreeList.stream() + .map(item -> { + SarModuleTree sarModuleTree = new SarModuleTree(); + sarModuleTree.setNextCondition(item.get(column).toString()); //查询子节点条件 + sarModuleTree.setLevel(finalLevel + 1); + //拼接前端显示名称 +// switch (finalLevel){ +// case 3: +// sarModuleTree.setModel(item.get(column).toString());//前端显示名称 +// break; +// case +// } - Map> collect = moduleTreeList.stream().collect(Collectors.groupingBy(SarModuleTree::getFtvstype1)); - collect.forEach((k, v)->{ - SarModelTree modelTree = new SarModelTree(); - //TODO 生成树型结构 -// modelTree - }); - return null; + return sarModuleTree; + }).collect(Collectors.toList()); + + + return collect; } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index b39f1f1f..cf74720e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -184,7 +184,12 @@ public class TsResourceServiceImpl extends ServiceImpl TsResourceQueryWrapper=new QueryWrapper<>(); - TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); +// TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); + /** + * 没有把改节点查出 + */ + TsResourceQueryWrapper.isNotNull("PARENT_ID"); + if(StringUtils.isNotBlank(tsResource.getSorDivide())){ TsResourceQueryWrapper.in("ID",getMenuIdList); } @@ -323,7 +328,9 @@ public class TsResourceServiceImpl extends ServiceImpl */ private List recursionGetListChildrenStand(TsResource resource,List children){ - List tsResources = children.stream().filter(resource1 -> resource1.getParentId().equals(resource.getId())).collect(Collectors.toList()); + List tsResources = children.stream() + .filter(resource1 -> resource1.getParentId().equals(resource.getId())) + .collect(Collectors.toList()); if(!tsResources.isEmpty()){ tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); tsResources.forEach(resource1 -> { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index 545ff443..d709188b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -41,7 +41,7 @@ public interface TsRoleDao extends BaseMapper { * @param menuId：权限ID */ @Insert("insert into ts_role_menu (role_id,menu_id) values (#{roleId},#{menuId})") - void addMenu(String roleId, String menuId); + void addMenu(@Param("roleId") String roleId, @Param("menuId") String menuId); /** * 删除权限 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java index 1a2c55e6..ae190b73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/controller/SarStandAttrDetailsController.java @@ -161,4 +161,17 @@ public class SarStandAttrDetailsController extends BaseController> selectFileFieldForSel1(){ return Result.success(sarStandAttrDetailsEOService.selectFileFieldForSel1(null)); } + + @ApiOperation(value = "|SarStandAttrDetailsEO|查询标准中所有文件类型") + @GetMapping("/getListData") +// @RequiresPermissions("lawss:sarStandAttrDetails:get") + public ResponseMessage> getListData(){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("ATTR_TYPE","file"); + List sarStandAttrDetails=sarStandAttrDetailsEOService.list(queryWrapper); + return Result.success(sarStandAttrDetails); + } + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java new file mode 100644 index 00000000..0e4610b6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/entity/listDTO.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.sarStandAttrDetails.entity; + +import lombok.Data; + +@Data +public class listDTO { + + private String key; + + private String value; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 7077606a..7c8206fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -15,18 +15,17 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

    @@ -77,6 +76,14 @@ public class SarPublicIdeaAllController extends BaseController } + @ApiOperation(value = "增加意见") + @PostMapping("/saveBatch") + public ResponseMessage saveBatch(@RequestBody List sar){ + boolean flag=sarPublicIdeaAllImpl.saveBatch(sar); + return Result.success("200",flag); + + } + @ApiOperation(value = "删除意见") @GetMapping("/deleteStand") public ResponseMessage deleteStand(DelStandDto delStandDto){ @@ -94,30 +101,50 @@ public class SarPublicIdeaAllController extends BaseController @ApiOperation(value = "导出全部意见") @GetMapping("/tuallStand") - public void getAllStand(HttpServletResponse response,String cid){ + public void getAllStand(HttpServletResponse response,@RequestParam(value = "cid")String cid,@RequestParam(value = "type",required = false)String type){ try { response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); - String fileName = URLEncoder.encode("意见详情", "UTF-8").replaceAll("\\+", "%20"); + String textName=""; + if ("1".equals(type)){ + textName= "流程意见详情"; + }else { + textName="意见详情"; + } + Map map=new HashMap<>(); + map.put("1","上报"); + map.put("2","处理后上报"); + String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(SarPublicIdeaAll.CID,cid); - wrapper.orderByAsc("part_code"); - data=sarPublicIdeaAllDao.selectList(wrapper); + data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type); } List standExcel=new ArrayList<>(); + List standExcel2=new ArrayList<>(); for (SarPublicIdeaAll sarPublicIdeaAll:data){ - GetExcelDto getExcelDto=GetExcelDto.builder() - .partCode(sarPublicIdeaAll.getPartCode()) - .oldText(sarPublicIdeaAll.getOldText()) - .newText(sarPublicIdeaAll.getNewText()) - .reason(sarPublicIdeaAll.getReason()) - .userName(sarPublicIdeaAll.getUserName()) - .deptName(sarPublicIdeaAll.getDeptName()) - .build(); - standExcel.add(getExcelDto); + if ("1".equals(type)) { + GetExcelDto2 getExcelDto = GetExcelDto2.builder() + .partCode(sarPublicIdeaAll.getPartCode()) + .oldText(sarPublicIdeaAll.getOldText()) + .newText(sarPublicIdeaAll.getNewText()) + .reason(sarPublicIdeaAll.getReason()) + .userName(sarPublicIdeaAll.getUserName()) + .deptName(sarPublicIdeaAll.getDeptName()) + .state(map.get(sarPublicIdeaAll.getState())) + .build(); + standExcel2.add(getExcelDto); + }else { + GetExcelDto getExcelDto = GetExcelDto.builder() + .partCode(sarPublicIdeaAll.getPartCode()) + .oldText(sarPublicIdeaAll.getOldText()) + .newText(sarPublicIdeaAll.getNewText()) + .reason(sarPublicIdeaAll.getReason()) + .userName(sarPublicIdeaAll.getUserName()) + .deptName(sarPublicIdeaAll.getDeptName()) + .build(); + standExcel.add(getExcelDto); + } } List> headList=new ArrayList>(); @@ -127,9 +154,16 @@ public class SarPublicIdeaAllController extends BaseController headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由")); headList.add(Lists.newArrayList("提出部门")); headList.add(Lists.newArrayList("提出人")); - - EasyExcel.write(response.getOutputStream(),GetExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") - .doWrite(standExcel); + if ("1".equals(type)){ + headList.add(Lists.newArrayList("处理意见")); + } + if ("1".equals(type)) { + EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(standExcel2); + }else { + EasyExcel.write(response.getOutputStream(), GetExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(standExcel); + } } catch (Exception e) { response.reset(); response.setContentType("application/json"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index 3719ea86..d361e5ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandIdea.dao; import com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,10 @@ import java.util.List; public interface SarPublicIdeaAllDao extends BaseMapper { List getPublicIdea(@Param("unique")String unique); + + List getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId); + + Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); + + List getPublicAllIdea(@Param("cid") String cid,@Param("type")String type); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java new file mode 100644 index 00000000..6d2b104d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto2.java @@ -0,0 +1,42 @@ +package com.adc.da.slrs.sarStandIdea.entity; + +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * //用于导出 + * + * @author ZhangZhiYuan + * @date 2021-07-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@HeadRowHeight(20) +@ColumnWidth(15) +public class GetExcelDto2 { + +// @ExcelProperty("章节编号") + private String partCode; +// @ExcelProperty("修改意见内容(包括理由或依据)") +// private String content; + private String oldText; + + private String newText; + + private String reason; +// @ExcelProperty("提出部门") + private String deptName; +// @ExcelProperty("提出人") + private String userName; + + private String state; + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java index 6c21bd31..a3609dcd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdea.java @@ -72,5 +72,8 @@ public class SarPublicIdea extends BaseEntity { @TableField("files_name") private String filesName; + @TableField("wkfiles") + private String wkfiles; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java index c50619dd..72cfc5f8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java @@ -63,4 +63,16 @@ public class SarPublicIdeaAll extends BaseEntity { public static final String CID = "cid"; + @TableField("chapter_name") + private String chapterName; + + @TableField(exist = false) + private String department; + + @TableField("wk_flag") + private String wkFlag; + + @TableField("state") + private String state; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java index 99547e00..4063dab4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaAllServiceImpl.java @@ -48,10 +48,13 @@ public class SarPublicIdeaAllServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("idea_id", detAllStandDto.getIdeaId()); - Page page = new Page<>(detAllStandDto.getPage(), detAllStandDto.getSize()); - IPage userIPage = sarPublicIdeaAllDao.selectPage(page, wrapper); + List sarPublicIdeaAlls=sarPublicIdeaAllDao.getAllDataByIdea(detAllStandDto.getPage(),detAllStandDto.getSize(),detAllStandDto.getIdeaId()); + Integer a=sarPublicIdeaAllDao.getAllDataByIdeaCount(detAllStandDto.getIdeaId()); + Page userIPage=new Page(); + userIPage.setTotal(a); + userIPage.setRecords(sarPublicIdeaAlls); + userIPage.setSize(detAllStandDto.getSize()); + userIPage.setCurrent(detAllStandDto.getPage()); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); List list = userIPage.getRecords(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 88bf5c29..0642b86c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; -import java.util.List; +import java.util.*; /** *

    @@ -53,6 +53,30 @@ public class SarStandItemsController extends BaseController { } } + @ApiOperation(value = "项目评估流程分解单查询") + @GetMapping("/workflowFindItems") + public ResponseMessage workflowFindItems( @RequestParam("ids") String ids,@RequestParam("types") String types){ + List id=new ArrayList<>(Arrays.asList(ids.split(","))); + List type=new ArrayList<>(Arrays.asList(types.split(","))); + Map map=new HashMap<>(); + int i =0 ; + for (String s:type) { + if (null!=map.get(s)){ + map.put(s,map.get(s)+","+id.get(i)); + }else { + map.put(s,id.get(i)); + } + i++; + } + List ItemDto = new ArrayList<>(); + map.entrySet().forEach(stringStringEntry -> { + if (!"BDR".equals(stringStringEntry.getKey())){ + ItemDto.addAll(ServiceImpl.findAllItems(stringStringEntry.getKey(),stringStringEntry.getValue().split(","))); + } + }); + return Result.success("200",ItemDto); + } + @ApiOperation(value = "分解单查询") @GetMapping("/querySarItemAndInterpretation") public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java index 3833259b..6d387013 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java @@ -25,11 +25,11 @@ public class FindSarItemsPageReqDTO extends BasePage { @ApiModelProperty(value = "新车型实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date XCXSSRQ; + private String XCXSSRQ; @ApiModelProperty(value = "在产车实施日期") @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date ZCCSSRQ; + private String ZCCSSRQ; @ApiModelProperty(value = "文件类型") private String fileType; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index 06cd41a3..7d32b016 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -125,12 +125,12 @@ public class SarStandItems extends BaseEntity { @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("XCXSSRQ") - private Date xccssrq; + private String xccssrq; @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @TableField("ZCCSSRQ") - private Date zccssrq; + private String zccssrq; @ApiModelProperty(value = "符合性要求-符合性状态") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 1d823c88..304f5632 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -154,25 +154,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl pageInfo = null; - try { - pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); - } catch (Exception e) { - e.printStackTrace(); - } List standId = new ArrayList<>(); - for (SarStandardsInfo standardsInfo : pageInfo){ - if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ - standId.add(standardsInfo.getId()); - } - } + List list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); - List list=new ArrayList<>(); - if (standId==null || standId.size()==0){ - list = null; - }else { - list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); - } IPage page1=new Page<>(); page1.setRecords(list); page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); @@ -195,6 +179,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(String type,String[] ids){ List list=dao.selectAllItemsByIds(type,ids); List res=new ArrayList<>(); + List chinese=new ArrayList<>(); if (null == list || list.isEmpty()){ return list; }else { @@ -206,20 +191,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl0){ mark=mark.substring(0,a); } - if (null != map.get(Integer.valueOf(mark))){ - map.get(Integer.valueOf(mark)).add(sarStandItemsDto); - }else { - integerList.add(Integer.valueOf(mark)); - List middle=new ArrayList<>(); - middle.add(sarStandItemsDto); - map.put(Integer.valueOf(mark),middle); - } + try { + if (null != map.get(Integer.valueOf(mark))) { + map.get(Integer.valueOf(mark)).add(sarStandItemsDto); + } else { + integerList.add(Integer.valueOf(mark)); + List middle = new ArrayList<>(); + middle.add(sarStandItemsDto); + map.put(Integer.valueOf(mark), middle); + } + }catch (Exception e){ + chinese.add(sarStandItemsDto); + } }); Collections.sort(integerList); integerList.forEach(integer -> { res.addAll(map.get(integer)); }); - + res.addAll(chinese); return res; } } @@ -231,7 +220,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl strings=new ArrayList<>(); + if (!standDTO.getProductLine().isEmpty()){ + if (standDTO.getProductLine().contains(",")){ + strings.addAll(new ArrayList<>(Arrays.asList(standDTO.getProductLine().split(",")))); + }else { + strings.add(standDTO.getProductLine()); + } + } + Page page=new Page(); + page.setCurrent(current); + page.setSize(pageSize); + QueryWrapper queryWrapper=new QueryWrapper<>(); + if (null!=standDTO.getProjectNumber()) { + queryWrapper.like("project_number", standDTO.getProjectNumber()); + } + if (null!=standDTO.getProjectName()) { + queryWrapper.like("project_name", standDTO.getProjectName()); + } + queryWrapper.in("product_line",strings); + queryWrapper.orderByAsc("product_line"); + // 创建一个新的list集合，用于存储去重后的元素 + IPage pageres=sarStandProjectLibraryService.page(page,queryWrapper); + return Result.success("200",pageres); + } /** * * @param current @@ -144,6 +175,29 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id,cars); return Result.success("200",list); } + + /** + * + * @param current + * @param pageSize + * @param id + * @return + * @author zj + * date 2021-07-15 + **/ + @GetMapping("/queryStandInfoNew") + @ApiOperation("查询标准信息") + public ResponseMessage queryStandInfoNew(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, + String id,String cars){ +// List list = sarStandProjectLibraryService.queryStandId(id); +// List list1 = new ArrayList(); +// for(SarStandProjectLibrary s:list){ +// list1.add(s.getStandId()); +// } +// System.out.println(list1); + IPage list = sarStandProjectLibraryService.queryStandInfoNew(current,pageSize,id,cars); + return Result.success("200",list); + } /** * * @param id @@ -192,6 +246,20 @@ public class SarStandProjectLibraryController extends BaseController list){ + sarStandProjectLibraryService.batchInsertAdd(list); + return Result.success("200","新增成功",list); + } /** * * @param standAttrInfoExcelDto diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index 73a61e1c..f5a92dab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -29,6 +29,8 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStands(); List getAllStand(); List updateByProjectId(@Param("id")String id, @Param("version")String version); + List updateByProjectIdBath(@Param("id")List id, @Param("version")String version); void deleteByProjectId(@Param("projectId")String projectId); + List selectListByids(@Param("ids") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java index a5e5ea27..ea981228 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java @@ -8,4 +8,8 @@ public class standDTO { private String uname; private String productLine; + + private String projectName; + + private String projectNumber; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index 140d8fd6..0385647a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -4,8 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; /** * //TODO 添加类/接口功能描述 @@ -47,16 +50,20 @@ public class StandAttrInfoDto { //责任部门 @ExcelProperty("责任部门") private String ZRBM; - //关联模块--卡车VPPS编码 - @ExcelProperty("关联模块--卡车VPPS编码") - private String KCCVPPSBM; - //关联模块--卡车vpps中文名称 - @ExcelProperty("关联模块--卡车vpps中文名称") - private String KCCVPPSCN; - //关联模块--乘用车VPPS编码 - @ExcelProperty("关联模块--乘用车VPPS编码") - private String CYCVPPSBM; - //关联模块--乘用车vpps中文名称 - @ExcelProperty("关联模块--乘用车vpps中文名称") - private String CYCVPPSCN; +// //关联模块--卡车VPPS编码 +// @ExcelProperty("关联模块--卡车VPPS编码") +// private String KCCVPPSBM; +// //关联模块--卡车vpps中文名称 +// @ExcelProperty("关联模块--卡车vpps中文名称") +// private String KCCVPPSCN; +// //关联模块--乘用车VPPS编码 +// @ExcelProperty("关联模块--乘用车VPPS编码") +// private String CYCVPPSBM; +// //关联模块--乘用车vpps中文名称 +// @ExcelProperty("关联模块--乘用车vpps中文名称") +// private String CYCVPPSCN; + + private Long unCount; + + private String endTimes; } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index e1487e33..85ed659b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -22,8 +22,11 @@ public interface SarStandProjectLibraryService { List queryByProductLine(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId, String cars); + + IPage queryStandInfoNew(int current, int pageSize, String standId, String cars); void deleteByIds(List ids); void batchInsert(@Param("ids") List list); + void batchInsertAdd(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); public Head AnalysisJsonAndStorage(String jsonStr); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index ef5124ef..bed9d1ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -351,13 +352,76 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userIPage = new Page<>(); + userIPage.setRecords(list); + userIPage.setTotal(userIPage1.getTotal()); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } + + @Override + public IPage queryStandInfoNew(int current, int pageSize, String standId, String cars) { + + //cars传回值为1时判断是从车型项目库中调取 + + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" + + " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" + + " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ", + "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " + + " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes "); + wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'"); + Page page1 = new Page<>(current, pageSize); + IPage userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1); + System.out.println("总条数"+userIPage1.getTotal()); + System.out.println("总页数"+userIPage1.getPages()); + + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN"); + wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.project_id ='"+ standId+"'"); + + Page page2 = new Page<>(current, pageSize); + IPage userIPage2 = sarStandAttrInfoDao.selectPage(page2, wrapper2); + System.out.println("总条数"+userIPage2.getTotal()); + System.out.println("总页数"+userIPage2.getPages()); + List list = new ArrayList<>(); + List list1 = userIPage1.getRecords(); + List list2 = userIPage2.getRecords(); + for(SarStandardsInfo s:list1){ + StandAttrInfoDto p =new StandAttrInfoDto(); + p.setStandId(s.getId()); + p.setStandNumber(s.getStandNumber()); + p.setStandSort(s.getStandSort()); + p.setStandYear(s.getStandYear()); + p.setStandName(s.getStandName()); + p.setStandType(s.getStandType()); + p.setStandEnName(s.getStandEnName()); + if (s.getUnCount()==0L && s.getCounts()>0L) { + p.setUnCount(s.getUnCount()); + }else if (s.getUnCount() == 0L && s.getCounts()==0L){ + p.setUnCount(2L); + }else { + p.setUnCount(1L); + } + p.setEndTimes(s.getEndTimes()); + for (SarStandAttrInfo a:list2){ + if(s.getId().equals(a.getStandId())){ p.setSSRQ(a.getSsrq()); p.setXCXSSRQ(a.getXcxssrq()); p.setZCCSSRQ(a.getZccssrq()); - p.setKCCVPPSBM(a.getKccvppsbm()); - p.setKCCVPPSCN(a.getKccvppscn()); p.setZRBM(a.getZrbm()); } } @@ -385,6 +449,26 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl list) { + List ids=new ArrayList<>(); + List projectIds=new ArrayList<>(); + list.forEach(standProjectRelationDto -> { + if (!ids.contains(standProjectRelationDto.getStandId())) { + ids.add(standProjectRelationDto.getStandId()); + }}); + List standProjectRelationDtos=sarStandProjectLibraryDao.selectListByids(ids); + List ins=new ArrayList<>(); + list.forEach(standProjectRelationDto -> { + if (!standProjectRelationDtos.contains(standProjectRelationDto.getProjectId())){ + ins.add(standProjectRelationDto); + projectIds.add(standProjectRelationDto.getProjectId()); + } + }); + sarStandProjectLibraryDao.batchInsert(ins); + sarStandProjectLibraryDao.updateByProjectIdBath(projectIds, TimeVersion()); + } + @Override public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto ,String id) { List ids = standAttrInfoExcelDto.getIds(); @@ -392,7 +476,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl wrapper1 = new QueryWrapper<>(); - wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME"); + wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT"); wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'"); List userList1 = SarStandardsInfoDao.selectList(wrapper1); QueryWrapper wrapper2 = new QueryWrapper<>(); @@ -428,24 +512,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl add(@RequestBody SarStandUnqualified sarStandUnqualified){ + sarStandUnqualified.setCreateTime(new Date()); + if (sarStandUnqualifiedService.save(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + + @ApiOperation("未符合项整改修改") + @PostMapping("/updateOne") + public ResponseMessage update(@RequestBody SarStandUnqualified sarStandUnqualified){ + if (sarStandUnqualifiedService.updateById(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + + @ApiOperation("未符合项整改修改") + @PostMapping("/updateBatch") + public ResponseMessage updateBatch(@RequestBody List sarStandUnqualified){ + if (sarStandUnqualifiedService.saveOrUpdateBatch(sarStandUnqualified)) { + return Result.success("新增成功"); + } + else{ + return Result.error("新增失败"); + } + } + /** * 分页查询未符合项 * @param sarStandUnqualifiedPage：筛选、分页信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java index 905cb9ee..3f4d6a3b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -71,6 +71,7 @@ public class BusinessDeptIssue { @ExcelIgnore @TableLogic(value = "0",delval = "1") + @TableField("del_flag") private String delFlag; @ExcelProperty("责任部门") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java index f68f5d24..2acb71ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java @@ -59,6 +59,7 @@ public class ProductDeptIssue { private String responseDept; @TableLogic(value = "0",delval = "1") + @TableField("del_flag") private String delFlag; @TableField("is_close") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index c4e954cb..65dfec0e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -51,6 +51,10 @@ public class SarStandUnqualified extends BaseEntity { @TableField("STAND_NAME") private String standName; + @ExcelIgnore + @ApiModelProperty(value = "项目编号") + @TableField("product_id") + private String productId; // @ExcelProperty("标准编号") // @ApiModelProperty(value = "标准编号") // @TableField("STAND_NUMBER") @@ -143,13 +147,21 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - @ExcelProperty("计划关闭时间") + @ExcelIgnore @ApiModelProperty(value = "计划关闭时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("PLAN_CLOSE_TIME") private Date planCloseTime; + + @ExcelProperty("计划关闭时间") + @ApiModelProperty(value = "计划关闭时间excel导出") + + @TableField(exist = false) + private String planCloseTimeExport; + + @ExcelIgnore @ApiModelProperty(value = "主键") @TableId(type = IdType.UUID) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index aaaff4f2..546b7201 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -18,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -54,7 +56,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl list1 = userIPage1.getRecords(); QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper1.like("stand_number",null); wrapper.select("STAND_SERIAL_NUMBER"); Page page = new Page<>(); IPage userIPage = sarStandUnqualifiedDao.selectPage(page,wrapper); @@ -66,26 +67,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); -// if(sarStandUnqualifiedPage.getStandId()!=null){ -// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); -// } -// //仅查询未关闭的 -// sarStandUnqualifiedQueryWrapper.eq("close_state",1); -// //根据 项目名称 进行查询 -// if(sarStandUnqualifiedPage.getProductName()!=null){ -// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); -// } -// //根据 责任部门 进行查询 -// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ -// sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); -// } -// //根据 标准号/标准名称 进行查询 -// if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){ -//// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName()); -// sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" + -// "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')"); -// } Page standUnqualifiedPage=new Page<>(); //判断前端是否提供页码和每页条数 List sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage); @@ -165,6 +146,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper); + // 去掉日期时分秒 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + + stand.forEach(item->{ + + Optional.ofNullable(item.getPlanCloseTime()) + .ifPresent(time ->{ + item.setPlanCloseTimeExport(sdf.format(time)); + }); + + }); + List a = stand; return a; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index c364e76e..987beea9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -4,9 +4,16 @@ package com.adc.da.slrs.sarStandWarning.controller; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlProduct; +import com.adc.da.slrs.sarStandIssueControlProduct.entity.StandIssueControlProductExcelVO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.Impl.EarlyWarningEOServiceImpl; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,10 +23,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; +import java.util.*; @RestController @RequestMapping("/${restPath}/sys/EarlyWarning") @@ -41,7 +47,7 @@ public class EarlyWarningEOController extends BaseController { * @author zj * date 2021-06-15 **/ - @GetMapping("/StandWarning") + @GetMapping("/${restPath}/StandWarning") @ApiOperation("标准预警查询") public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, @@ -53,6 +59,26 @@ public class EarlyWarningEOController extends BaseController { IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 return getResponseMessage(list1, list2, list3, list4); } + + @GetMapping("/getStandWarning") + @ApiOperation("标准预警查询") + public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ + IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); + standWarning.getRecords().forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + return Result.success(standWarning); + } + + + private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { List> listMap = new ArrayList>(); Map map = new HashMap(); @@ -71,7 +97,7 @@ public class EarlyWarningEOController extends BaseController { * date 2021-06-15 **/ @GetMapping("/ChangePermissions") - @ApiOperation("更改权限") + @ApiOperation("取消预警") public ResponseMessage ChangePermissions(String id) { String power = earlyWarningEOService.ChangePermissions(id); return Result.success("200",power); @@ -102,4 +128,40 @@ public class EarlyWarningEOController extends BaseController { return Result.success("200",listMap); } + + + + + @GetMapping("/exportWarning") + @ApiOperation("导出预警") + public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception { + + + // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + if(excelVO.getExportName()==null){ + excelVO.setExportName("标准预警"); + } + String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + +// List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + + + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(exportExcel); + } catch (Exception e) { + System.out.println(e); + // 重置response + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().println(JSON.toJSONString(Result.error())); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 8311d235..618770a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -2,9 +2,19 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; public interface EarlyWarningEODao extends BaseMapper { + IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); + + + List exportWarning(@Param("idList") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/WarningDateDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/WarningDateDao.java new file mode 100644 index 00000000..88b46af8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/WarningDateDao.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.sarStandWarning.dao; + +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +public interface WarningDateDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 20aeca75..fec3d95e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -1,10 +1,15 @@ package com.adc.da.slrs.sarStandWarning.entity; import com.adc.da.base.entity.BaseEntity; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.Tag; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,54 +28,91 @@ public class EarlyWarningEO extends BaseEntity { private static final long serialVersionUID = 1L; + @ExcelIgnore + @ApiModelProperty("id") @TableId("ID") private String id; + @ExcelIgnore + @ApiModelProperty("标准id") @TableField("STAND_ID") private String standId; - @TableField("STAND_TYPE") + @ExcelIgnore + @ApiModelProperty("分解单条款id") + @TableField("ITEM_ID") + private String itemId; + + @ExcelIgnore + @ApiModelProperty("标准类别") + @TableField(exist = false) private String standType; - @TableField("STAND_CODE") + @ExcelProperty(value = "标准编号",index = 1) + @ColumnWidth(20) + @ApiModelProperty("标准号") + @TableField(exist = false) private String standCode; - @TableField("STAND_NAME") + @ExcelProperty(value = "标准名称",index = 2) + @ColumnWidth(40) + @ApiModelProperty("标准名称") + @TableField(exist = false) private String standName; - @TableField("PUT_TIME") + @ExcelProperty(value = "发布日期",index = 5) + @ApiModelProperty("发布日期") + @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; + @ExcelIgnore @TableField(exist = false) private Date lastTime; - @TableField("APPLY_TYPE") + @ExcelIgnore + @ApiModelProperty("适用车型") + @TableField(exist = false) private String applyType; - @TableField("DUTY_ENGINEER") + @ExcelIgnore + @ApiModelProperty("责任工程师") + @TableField(exist = false) private String dutyEngineer; - @TableField("ITEMS_ID") + @ExcelIgnore + @ApiModelProperty("条款（分解单）id") + @TableField(exist = false) private String itemsId; - @TableField("ITEMS_NUM") + @ExcelProperty(value = "条款编号",index = 3) + @ColumnWidth(20) + @ApiModelProperty("条款（分解单）编号") + @TableField(exist = false) private String itemsNum; - @TableField("ITEMS_NAME") + @ExcelProperty(value = "条款名称",index = 4) + @ColumnWidth(40) + @ApiModelProperty("条款（分解单）名称") + @TableField(exist = false) private String itemsName; + @ExcelIgnore @TableField("POLICY_ID") private String policyId; - @TableField("POLICY_NAME") + @ExcelIgnore + @TableField(exist = false) private String policyName; + @ExcelIgnore @TableField("MARK") private String mark; + @ExcelIgnore @TableField("POWER") private String power; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java new file mode 100644 index 00000000..b1604d9a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java @@ -0,0 +1,92 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Accessors(chain = true) +public class StandWarningEO extends EarlyWarningEO { + private static final long serialVersionUID = 1L; + + @ExcelProperty("新车型实施日期") + @ApiModelProperty("新车型实施日期") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String XCXSSRQ; + + @ExcelProperty("在产车实施日期") + @ApiModelProperty("在产车实施日期") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String ZCCSSRQ; + + @ExcelProperty("实施日期") + @ApiModelProperty("实施日期") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String SSRQ; + + + @ExcelProperty("标准编号") + private String standNum; + + @ExcelProperty("标准类别") + private String standSort; + + @ExcelProperty("标准年份") + private String standYear; + + @ExcelProperty("发布日期") + private String issueTime; + + @ExcelIgnore + private Integer page; + + @ExcelIgnore + private Integer pageSize; + + @ExcelIgnore + @ApiModelProperty("范围查询新车型实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startXCXSSRQ; + + @ExcelIgnore + @ApiModelProperty("范围查询新车型实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endXCXSSRQ; + + @ExcelIgnore + @ApiModelProperty("范围查询在产车实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startZCCSSRQ; + + @ExcelIgnore + @ApiModelProperty("范围查询在产车实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endZCCSSRQ; + + @ExcelIgnore + @ApiModelProperty("范围查询实施日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startSSRQ; + + + @ExcelIgnore + @ApiModelProperty("范围查询实施日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endSSRQ; + + + @ExcelIgnore + @ApiModelProperty("范围查询发布日期开始") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String startPutTime; + + @ExcelIgnore + @ApiModelProperty("范围查询发布日期结束") + @DateTimeFormat(pattern = "YYYY-MM-dd") + private String endPutTime; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java new file mode 100644 index 00000000..b1915f6f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("warning_date") +public class WarningDate { + + @TableField("id") + private String id; + + @TableField("law_id") + private String lawId; + + @TableField("itemId") + private String itemId; + + @TableField("SSRQ") + private String SSRQ; + + @TableField("time_Name") + private String timeName; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExcelVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExcelVO.java new file mode 100644 index 00000000..179e4d3f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExcelVO.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + + +@Data +public class WarningExcelVO { + @ApiModelProperty("文件名") + String exportName; + @ApiModelProperty("导出的ID列表") + List ids; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java new file mode 100644 index 00000000..db2f7b95 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WarningExportVO extends EarlyWarningEO { + + + + @ExcelProperty(value = "实施日期",index = 6) + @ColumnWidth(20) + @ApiModelProperty("实施日期") + private String SSRQ; + + + @ExcelProperty(value = "新车型实施日期",index = 7) + @ColumnWidth(20) + @ApiModelProperty("新车型实施日期") + private String XCXSSRQ; + + @ExcelProperty(value = "在产车实施日期",index = 8) + @ColumnWidth(20) + @ApiModelProperty("在产车实施日期") + private String ZCCSSRQ; + + @ExcelProperty(value = "类型",index = 0) + @ApiModelProperty("标准类别显示") + private String standTypeShow; + + @ExcelProperty(value = "适用车型",index = 9) + @ColumnWidth(20) + @ApiModelProperty("适用车型展示") + private String applyTypeShow; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index c037a64c..b5079d69 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -2,6 +2,9 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,4 +19,9 @@ public interface EarlyWarningEOService extends IService { IPage oldPolicyQuery(int current,int pageSize); String batchSave(List earlyWarningEOS); String ChangePermissions(String id); + + + IPage getStandWarning(StandWarningEO queryPage); + + List getExportExcel(WarningExcelVO excelVO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java new file mode 100644 index 00000000..6e206854 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java @@ -0,0 +1,8 @@ +package com.adc.da.slrs.sarStandWarning.service; + +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IWarningDateService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 680b2b53..0b8f6f78 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -1,11 +1,12 @@ package com.adc.da.slrs.sarStandWarning.service.Impl; -import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; -import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -15,9 +16,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; @Service("EarlyWarningEOService") @@ -41,33 +40,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); - //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",1); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -75,32 +48,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",2); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -108,32 +56,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",3); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -141,32 +64,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 - if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ - wrapper.like("STAND_CODE",earlyWarningEO.getStandCode()); - } - //根据标准名称查询 - if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){ - wrapper.like("STAND_NAME",earlyWarningEO.getStandName()); - } - //根据实施日期查询 - if (earlyWarningEO.getPutTime() != null ){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - if (earlyWarningEO.getLastTime() != null){ - wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime())); - }else { - wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); - } - } - if (earlyWarningEO.getLastTime()!=null){ - SimpleDateFormat formater = new SimpleDateFormat(); - formater.applyPattern("yyyy-MM-dd"); - wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); - } - //根据适用车型查询 - if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){ - wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType()); - } + selectMethods(earlyWarningEO, wrapper); wrapper.eq("mark",4); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @@ -207,6 +105,30 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getStandWarning(StandWarningEO queryPage) { + IPage iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize()); + return earlyWarningEODao.selectWarningPage(iPage,queryPage); + } + + /** + * 导出预警 + * @return + */ + @Override + public List getExportExcel(WarningExcelVO excelVO){ + List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); +// IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null); + + return standWarningEOList; + } + + private IPage getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper wrapper) { wrapper.eq("power",1); Page page = new Page<>(current, pageSize); @@ -215,4 +137,38 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl wrapper) { + //根据标准编号查询 + if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0) { + wrapper.like("STAND_CODE", earlyWarningEO.getStandCode()); + } + //根据标准名称查询 + if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0) { + wrapper.like("STAND_NAME", earlyWarningEO.getStandName()); + } + //根据实施日期查询 + if (earlyWarningEO.getPutTime() != null) { + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + if (earlyWarningEO.getLastTime() != null) { + wrapper.between("PUT_TIME", formater.format(earlyWarningEO.getPutTime()), formater.format(earlyWarningEO.getLastTime())); + } else { + wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime())); + } + } + if (earlyWarningEO.getLastTime() != null) { + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime())); + } + //根据适用车型查询 + if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0) { + wrapper.like("APPLY_TYPE", earlyWarningEO.getApplyType()); + } + } + + + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java new file mode 100644 index 00000000..e8dd0771 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandWarning.service.Impl; + +import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class WarningDateServiceImpl extends ServiceImpl implements IWarningDateService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java index 872681f5..50e9f4e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationNationalStandardController.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl.SarInterpretationNationalStandardServiceImpl; import io.swagger.annotations.ApiOperation; @@ -37,4 +39,14 @@ public class SarInterpretationNationalStandardController extends BaseController< return sarInterpretationNationalStandardService.saveBath(findStandDto); } + @ApiOperation(value = "修改技术评估结果") + @PostMapping("/updateById") + public ResponseMessage updateById(@RequestBody SarInterpretationNationalStandard findStandDto){ + if (sarInterpretationNationalStandardService.updateData(findStandDto)) { + return Result.success("success"); + }else { + return Result.error("error"); + } + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index d83b45e4..03be8495 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import oracle.ucp.proxy.annotation.Post; import org.apache.commons.beanutils.BeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +59,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,type"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } @@ -79,7 +78,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getPosition() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME"); + queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE, INTERPRETATION_TIME,risk_degree"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } @@ -175,6 +174,46 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } + + @ApiOperation(value = "标准涉及项目复合性详情") + @GetMapping("/productNewDetail") + public ResponseMessage>> selectProductDetail(SarStandardComplianceProductAssessEO eo) throws Exception { + IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); + Map> map=new HashMap<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("STAND_ID", eo.getStandId()); + queryWrapper.eq("product_id", eo.getProductId()); + queryWrapper.isNotNull("research_completion_time"); + queryWrapper.orderByAsc("product_name"); + queryWrapper.orderByAsc("standard_item"); + Page p1=new Page(); + IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + BeanUtils.copyProperties(page,p1); + p1.setRecords(page.getRecords()); + p1.setTotal(page.getTotal()); + map.put("unfit",p1); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("STAND_ID", eo.getStandId()); + queryWrapper1.eq("product_id", eo.getProductId()); + queryWrapper1.ne("research_compliance",""); + queryWrapper1.orderByAsc("product_name"); + queryWrapper1.orderByAsc("standard_item"); + IPage page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1); + map.put("fit",page1); + return Result.success(map); + } + + @ApiOperation(value = "标准涉及项目复合性") + @GetMapping("/productNew") + public ResponseMessage> selectProduct(unCountDTO eo) throws Exception { + Page iPage = new Page<>(); + iPage.setCurrent(eo.getCurrent()); + iPage.setSize(eo.getSize()); + + IPage page = iSarStandardComplianceProductAssessService.selectPages(iPage, eo); + return Result.success(page); + } + @ApiOperation(value = "插入标准涉及项目符合性清单") @PostMapping("/add") public ResponseMessage insertProduct(@RequestBody List eo) throws Exception { @@ -195,20 +234,12 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - //如果查询条件里标准编号不为空，查询 - if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber()); - //如果查询条件里标准名称不为空，查询 - if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName()); - //如果查询条件里具体章条不为空，查询 - if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem()); - - if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); - - IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while (page.getRecords().remove(null)) ; - return Result.success(page); + List standards=iSarInterpretationNationalStandardService.getAllDatas(eo); + Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo); + iPage.setTotal(datasCount); + iPage.setRecords(standards); + while (iPage.getRecords().remove(null)) ; + return Result.success(iPage); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java index b01295a6..b7a3094c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java @@ -1,7 +1,11 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

    @@ -13,4 +17,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarInterpretationNationalStandardDao extends BaseMapper { + boolean updateData(@Param("find") SarInterpretationNationalStandard findStandDto); + + List getAllDatas(InterpretationEO sarInterpretationNationalStandard); + + Integer getAllDatasCout(InterpretationEO sarInterpretationNationalStandard); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java index 93e7b580..6cf6e1b8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java @@ -1,7 +1,14 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

    @@ -13,4 +20,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarStandardComplianceProductAssessDao extends BaseMapper { + List selectPages(@Param("page")Long page,@Param("pageSize")Long size,@Param("product") unCountDTO productAssess); + + List selectPagesCount(@Param("product")unCountDTO productAssess); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java index 94acce6d..ea428fed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java @@ -93,4 +93,9 @@ public class SarInterpretationNationalStandard extends BaseEntity { @TableField("ID") private String id; + + @ApiModelProperty(value = "风险程度") + @TableField("risk_degree") + private String riskDegree; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index c6496762..4a862f68 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -1,7 +1,6 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.entity; import com.adc.da.base.entity.BaseEntity; -import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.annotation.TableField; @@ -121,7 +120,23 @@ public class SarStandardComplianceProductAssess extends BaseEntity { @TableField("type") private String type; + @ApiModelProperty(value = "评估时间") + @TableField("evaluation_time") + private String evaluationTime; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people") + private String evaluationPeople; + + @ApiModelProperty(value = "评估人") + @TableField("evaluation_people_name") + private String evaluationPeopleName; + private String id; + @ApiModelProperty(value = "符合不符合") + @TableField(exist = false) + private String bfh; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java new file mode 100644 index 00000000..b4969e90 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java @@ -0,0 +1,35 @@ +package com.adc.da.slrs.sarStandardComplianceAssessResult.entity; + +import lombok.Data; + +@Data +public class unCountDTO { + + private String standId; + + private String productName; + + private String productId; + + private String productNumber; + + private String productLine; + + private String projectGroup; + + private String projectManager; + + private String uName; + + private String unCount; + + private Long current; + + private Long size; + + //项目编号 + private String sarId; + + private String type; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java index 6a604f3f..52e6e773 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,4 +17,10 @@ import java.util.List; public interface ISarInterpretationNationalStandardService extends IService { String saveBath(List sarInterpretationNationalStandards); + + boolean updateData(SarInterpretationNationalStandard findStandDto); + + List getAllDatas(InterpretationEO sarInterpretationNationalStandard); + + Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java index f813e993..3b36bdbb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarStandardComplianceProductAssessService.java @@ -1,7 +1,12 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; + /** *

    @@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ISarStandardComplianceProductAssessService extends IService { + IPage selectPages(Page page, @Param("product") unCountDTO productAssess); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index b65b6539..5986628f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; @@ -24,8 +25,8 @@ import java.util.List; @Service public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl implements ISarInterpretationNationalStandardService { -// @Autowired -// SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; + @Autowired + SarInterpretationNationalStandardDao sarInterpretationNationalStandardDao; @Override public String saveBath(List sarInterpretationNationalStandards) { @@ -50,4 +51,19 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl getAllDatas(InterpretationEO sarInterpretationNationalStandard) { + return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard); + } + + @Override + public Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard) { + return sarInterpretationNationalStandardDao.getAllDatasCout(sarInterpretationNationalStandard); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java index ea8c9f44..3bd6dce7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java @@ -2,10 +2,17 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssessEO; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.unCountDTO; import com.adc.da.slrs.sarStandardComplianceAssessResult.service.ISarStandardComplianceProductAssessService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

    * 服务实现类 @@ -17,4 +24,25 @@ import org.springframework.stereotype.Service; @Service public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl implements ISarStandardComplianceProductAssessService { + @Autowired + SarStandardComplianceProductAssessDao sarStandardComplianceProductAssessDao; + + + @Override + public IPage selectPages(Page pages, unCountDTO productAssess) { + IPage productAssessIPage= new Page<>(); + List res=sarStandardComplianceProductAssessDao.selectPages(pages.getCurrent(),pages.getSize(),productAssess); + res.forEach(unCountDTO -> {unCountDTO.setStandId(productAssess.getStandId()); + unCountDTO.setType(productAssess.getType());}); + productAssessIPage.setRecords(res); + List a=sarStandardComplianceProductAssessDao.selectPagesCount(productAssess); + if (null!=a) { + productAssessIPage.setTotal(a.size()); + }else { + productAssessIPage.setTotal(0); + } + productAssessIPage.setCurrent(pages.getCurrent()); + productAssessIPage.setSize(pages.getSize()); + return productAssessIPage; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index d6e5d118..0182065a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -46,6 +46,7 @@ import java.net.URLEncoder; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** *

    @@ -110,9 +111,62 @@ public class SarStandardsInfoController extends BaseController page.setUserId(LoginUserUtil.getUserId()); } List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + return Result.success(getPageInfo(page.getPager(), rows)); } + @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") + @GetMapping("/getSarStandardsInfoPageByWk1") + //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") + public ResponseMessage> getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception { + if (null != page.getNowOrderBy()) { + nowOrderFunc(page); + } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { + List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); + if (StringUtils.isNotBlank(advanceStr)) { + page.setAdvanceSearchStr(advanceStr); + } else { + page.setAdvanceSearchStr(null); + } + } + + if(page.getUserId() == null || page.getUserId().equals("")){ + page.setUserId(LoginUserUtil.getUserId()); + } + List rows = sarStandardsInfoEOService.getSarStandardsInfoPageByWk1(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + + return Result.success(getPageInfo(page.getPager(), rows)); + } + + + private void nowOrderFunc(SarStandardsInfoEOPage page) { switch (page.getNowOrderBy()) { case 1: @@ -249,7 +303,7 @@ public class SarStandardsInfoController extends BaseController if (result > 0) { return Result.success("0", "删除成功", result); }else if(result == -1) { - return Result.success("-1","所选的标准下挂有标准，无法删除"); + return Result.success("-1","所选的标准下挂有清单，无法删除"); } else { return Result.error("删除失败"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 8d2845a4..fafcea69 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -25,6 +25,8 @@ public interface SarStandardsInfoDao extends BaseMapper { int getSarStandardsInfoCount(SarStandardsInfoEOPage page); + int getSarStandardsInfoCountWk1(SarStandardsInfoEOPage page); + int insertSelective(SarStandardsInfo page); SarStandardsInfo selectByPrimaryKeyAndModifyTime(SarStandardsInfo page); @@ -70,4 +72,6 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsInfoBynumber(SarStandardsInfoEOPage page); + int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List list); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 0f5cdc58..142e98a1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -142,6 +142,18 @@ public class SarStandardsInfo extends BaseEntity { @TableField("STAND_SYSTEM") private String standSystem; + @ApiModelProperty(value = "为符合数量") + @TableField(exist = false) + private Long unCount; + + @ApiModelProperty(value = "为符合数量") + @TableField(exist = false) + private Long counts; + + @ApiModelProperty(value = "整改完成时间") + @TableField(exist = false) + private String endTimes; + // 以下为非表中字段 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index 6b48976e..62203ee5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -88,8 +88,19 @@ public class SarStandardsInfoEOPage extends BasePage { private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; private String order1 = ""; -// zhaokaiyao - private String textStatus;//文本状态 + /** + * zhaokaiyao + * 文本状态 + */ + private String textStatus; + /** + * 日期范围查询发布日期开始 + */ + private String startIssueTime; + /** + * 日期范围查询发布日期结束 + */ + private String endIssueTime; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index aa4617f5..4caf6161 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -21,6 +21,8 @@ public interface ISarStandardsInfoService extends IService { List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception; + List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception; List getSarStandardsInfoPageBak1(SarStandardsInfoEOPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0e714994..95671ab9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -3,6 +3,9 @@ package com.adc.da.slrs.sarStandardsInfo.service.impl; import com.adc.da.att.entity.AttFileEO; import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; @@ -53,6 +56,9 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitInfoEODao; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEOPage; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao; import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao; @@ -120,6 +126,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPageByWk1(SarStandardsInfoEOPage page) throws Exception { + //查询当前登录人角色拥有权限的菜单 + if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("ID",page.getMenuId()); + qw.isNull("PARENT_ID"); + List children = iTsResourceService.list(qw); + if(children.isEmpty() && !page.getMenuId().equals("nomenu")){ +// List getMenuIdList = tsUserService.getResourceUserId(page.getUserId()); +// if (getMenuIdList != null && !getMenuIdList.isEmpty()) { +// page.setMenuRoleList(getMenuIdList); +// } else { +// page.setMenuRoleList(null); +// } + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); + if (ids != null && !ids.isEmpty()) { + page.setMenuAllChildrenIdList(ids); + } + } + } + Integer rowCount = dao.getSarStandardsInfoCountWk1(page); + page.getPager().setRowCount(rowCount); + List sarlist = dao.getSarStandardsInfoPage(page,"996"); + attrInfoCollect(sarlist); + return sarlist; + } + @Override public List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception { //查询当前登录人角色拥有权限的菜单 @@ -539,16 +576,23 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); Map getAttrMap = row.getAttrInfoMap(); if (getAttrMap != null && getAttrMap.size() > 0) { - //存在的分解单文本名称列表 - LinkedList itemExistList = new LinkedList<>(); + //判断文本是否已被拆分,把已被拆分过的文件给前端判断是否显示分解单 + SarFileSplitInfoEOPage sarFileSplitInfoEOPage = new SarFileSplitInfoEOPage(); + sarFileSplitInfoEOPage.setStandId(row.getId()); + List sarFileSplitInfoEOS = sarFileSplitInfoEODao.queryByPageOwn(sarFileSplitInfoEOPage); + List itemExistList = sarFileSplitInfoEOS.stream() + .map(item -> item.getFileType()) + .collect(Collectors.toList()); getAttrMap.put("itemExistList",itemExistList); + for (Map.Entry entry : getAttrMap.entrySet()) { String name = entry.getKey(); String value = ""; @@ -557,15 +601,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileObj = attFileEOService.getMultiFileInfos(value); entry.setValue(fileObj); - //以标准id和文本类型查询分解单表 有数据设标记为为 1 - FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO(); - sarItemCount.setStandId(row.getId()); - sarItemCount.setFileType(name); - Integer sarItemsCount = standItemsDao.sarItemCount(sarItemCount); - if (sarItemsCount>0){ - //存在分解单的文本名称存入列表 - itemExistList.add(name); - } } }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { value = entry.getValue().toString(); @@ -578,7 +613,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl stringList = tsUserService.listObjs(tsUserQW, o ->o.toString()); - value= String.join(",", stringList); + value= String.join(",", stringList.isEmpty() ? valArr : stringList); break; } //通过id绑定责任部门师名称 @@ -587,14 +622,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString()); - value = String.join(",", stringList); + value= String.join(",", stringList.isEmpty() ? valArr : stringList); break; } default:value = dicTypeEODao.getDicNamesByCodes(valArr); } - entry.setValue(value); + entry.setValue(value == null ? String.join(",",valArr) : value); } } } @@ -1000,10 +1035,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl multiTimeMap) throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (multiTimeMap != null && multiTimeMap.size() > 0) { List standTimeList = new ArrayList<>(); + List warningDateList = new ArrayList<>(); + for (Map.Entry entry : multiTimeMap.entrySet()) { String value = entry.getValue(); String field = entry.getKey(); @@ -1024,6 +1063,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("law_id",standId); + warningDateService.remove(wrapper); + warningDateService.saveBatch(warningDateList); + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java index 12edcf60..f4a48ad6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/controller/TsUrlController.java @@ -1,6 +1,8 @@ package com.adc.da.slrs.sarUrl.controller; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarUrl.entity.OrderUrlVO; @@ -12,12 +14,21 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.imageio.ImageIO; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import javax.swing.*; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; import java.util.Arrays; +import java.util.Base64; import java.util.List; /** @@ -34,6 +45,52 @@ public class TsUrlController{ @Autowired private ITsUrlService tsUrlService; + @Autowired + private IAttFileEOService iAttFileEOService; + + @Value("${file.path}") + private String filePath; + + @GetMapping("getIconImg") + public String getIconImg(HttpServletRequest request, HttpServletResponse response){ + String url = ""; + String path = "api/att/attFile/upload"; + ServletOutputStream outputStream = null; + FileInputStream inputStream = null; + //通过id获取路径 + String id = request.getParameter("id"); + String fid = tsUrlService.getById(id).getIcon(); + List attFileEOS = iAttFileEOService.getMultiFileInfos(fid); + if(attFileEOS.isEmpty()){ + return null; + } + AttFileEO attFileEO = attFileEOS.get(0); + url = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); + + try { + System.out.println(id); + TsUrl tsUrl = tsUrlService.getById(id); + System.out.println(tsUrl); + + File file = new File(url); + if(!file.exists()) return null; + inputStream = new FileInputStream(file); + response.setContentType("image/jpeg"); + outputStream = response.getOutputStream(); + int len = 0; + byte[] buffer = new byte[1024 * 10]; + while ((len = inputStream.read(buffer)) != -1){ + outputStream.write(buffer,0,len); + } + outputStream.flush(); + outputStream.close(); + inputStream.close(); + } catch (IOException e) { + System.out.println("---------图标获取异常--------------"); + } + return null; + } + @ApiOperation("查询") @GetMapping public ResponseMessage> getUrls(){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java index 6798937c..12d6c292 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUrl/entity/TsUrl.java @@ -61,4 +61,10 @@ public class TsUrl implements Serializable { /**排序*/ @ApiModelProperty(value = "排序") private Integer orderBy; + + /**新增*/ + @ApiModelProperty(value = "图标信息") + private String icon; + @ApiModelProperty(value = "位置") + private Integer type; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java index 40166850..3b2bab67 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -150,6 +150,10 @@ public class TsUser extends BaseEntity { @TableField(exist = false) private Integer size; + @TableField(exist = false) + private String token; + + public TsUser() { } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 3703d472..ad53434a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -78,4 +78,6 @@ public interface ITsUserService extends IService { List getSecondMenusByUserId(String userId); List selectByName(String name); + + List selectNameById(List strings,String type); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 5f361bea..2ff1ec6b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -305,4 +305,24 @@ public class TsUserServiceImpl extends ServiceImpl implements }); return result; } + + @Override + public List selectNameById(List strings,String type) { + QueryWrapper tsUserQueryWrapper=new QueryWrapper<>(); + tsUserQueryWrapper.in("ACCOUNT",strings); + QueryWrapper nameQueryWrapper=new QueryWrapper<>(); + nameQueryWrapper.in("UNAME",strings); + List res= tsUserDao.selectList(tsUserQueryWrapper); + List res1= tsUserDao.selectList(nameQueryWrapper); + res1.removeIf(tsUser -> res.contains(tsUser)); + res.addAll(res1); + List result=new ArrayList<>(); + res.forEach(tsUser -> { + UpDTO upDTO=new UpDTO(); + upDTO.setValue(tsUser.getUname()+"("+tsUser.getAccount()+")"); + upDTO.setId(tsUser.getUserId()); + result.add(upDTO); + }); + return result; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java index ccd79b39..6865fbd8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -40,10 +40,10 @@ public class SarVppsTreeController extends BaseController { @ApiOperation("根据父ID查询子所有资源") @GetMapping("/childByList") - public ResponseMessage> childByList(String ids){ - SarVppsTree tree = new SarVppsTree(); - tree.setId(ids); - List tsResources = iSarVppsTreeService.recursionGetChildren(tree); + public ResponseMessage> childByList(SarVppsTree parent){ +// SarVppsTree tree = new SarVppsTree(); +// tree.setId(ids); + List tsResources = iSarVppsTreeService.recursionGetChildren(parent); return Result.success(tsResources); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java index e9fb22cf..8e31ac90 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java @@ -13,7 +13,7 @@ import java.util.List; /** *

    - * + * *

    * * @author super_liu @@ -66,6 +66,18 @@ public class SarVppsTree extends BaseEntity { @TableField(exist = false) private String parentIdsName; + @ApiModelProperty("层级") + @TableField("LEVEL") + private Integer level; + + @ApiModelProperty("类型") + @TableField("TYPE") + private String type; + + @ApiModelProperty("查询子节点条件") + @TableField(exist = false) + private String nextCondition; + @TableField(exist=false) private List roleIds; @@ -73,4 +85,6 @@ public class SarVppsTree extends BaseEntity { private List childMenuIds; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java index 32c8c76d..c43411d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -27,8 +27,14 @@ public class SarVppsTreeServiceImpl extends ServiceImpl getAll(SarVppsTree sarVppsTree) { QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); - tsResourceQueryWrapper.isNull("PID"); + tsResourceQueryWrapper.eq("TYPE",sarVppsTree.getType()) + .eq("LEVEL",0); List list = this.baseMapper.selectList(tsResourceQueryWrapper); + + list.forEach(item->{ + item.setCode(item.getVppsCode()+item.getChineseName()); + item.setId("10"); + }); // for(SarVppsTree tree:list){ // tree.setChildren(recursionGetChildren((tree))); // } @@ -44,11 +50,20 @@ public class SarVppsTreeServiceImpl extends ServiceImpl recursionGetChildren(SarVppsTree parent){ QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("SORT"); - sarMenuQueryWrapper.in("PID",parent.getId()); - List children=this.baseMapper.selectList(sarMenuQueryWrapper); - for(SarVppsTree sarMenu:children){ - sarMenu.setChildren(recursionGetChildren((sarMenu))); + + sarMenuQueryWrapper.eq("LEVEL", parent.getLevel()+1) + .eq("TYPE",parent.getType()); + + + if(parent.getLevel()!=0){ + sarMenuQueryWrapper.like("VPPS_CODE",parent.getId()); } + List children=this.baseMapper.selectList(sarMenuQueryWrapper); + + children.forEach(item->{ + item.setId(item.getVppsCode()); + item.setCode(item.getVppsCode()+item.getChineseName()); + }); return children; } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/EventUtils/DiffMatchPatch.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/EventUtils/DiffMatchPatch.java new file mode 100644 index 00000000..0ab2356d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/EventUtils/DiffMatchPatch.java @@ -0,0 +1,2276 @@ +package com.adc.da.slrs.standardSplit.EventUtils; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2021年11月28日 12:30 + */ +/* + * Diff Match and Patch + * + * Copyright 2006 Google Inc. + * http://code.google.com/p/google-diff-match-patch/ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +/* + * Functions for diff, match and patch. + * Computes the difference between two texts to create a patch. + * Applies the patch onto another text, allowing for errors. + * + * @author fraser@google.com (Neil Fraser) + */ + +/** + * Class containing the diff, match and patch methods. + * Also contains the behaviour settings. + */ +@SuppressWarnings("all") +public class DiffMatchPatch { + + // Defaults. + // Set these on your diff_match_patch instance to override the defaults. + + /** + * Number of seconds to map a diff before giving up (0 for infinity). + */ + public float Diff_Timeout = 1.0f; + /** + * Cost of an empty edit operation in terms of edit characters. + */ + public short Diff_EditCost = 4; + /** + * The size beyond which the double-ended diff activates. + * Double-ending is twice as fast, but less accurate. + */ + public short Diff_DualThreshold = 32; + /** + * At what point is no match declared (0.0 = perfection, 1.0 = very loose). + */ + public float Match_Threshold = 0.5f; + /** + * How far to search for a match (0 = exact location, 1000+ = broad match). + * A match this many characters away from the expected location will add + * 1.0 to the score (0.0 is a perfect match). + */ + public int Match_Distance = 1000; + /** + * When deleting a large block of text (over ~64 characters), how close does + * the contents have to match the expected contents. (0.0 = perfection, + * 1.0 = very loose). Note that Match_Threshold controls how closely the + * end points of a delete need to match. + */ + public float Patch_DeleteThreshold = 0.5f; + /** + * Chunk size for context length. + */ + public short Patch_Margin = 4; + /** + * The number of bits in an int. + */ + private int Match_MaxBits = 32; + + /** + * Internal class for returning results from diff_linesToChars(). + * Other less paranoid languages just use a three-element array. + */ + protected static class LinesToCharsResult { + protected String chars1; + protected String chars2; + protected List lineArray; + + protected LinesToCharsResult(String chars1, String chars2, + List lineArray) { + this.chars1 = chars1; + this.chars2 = chars2; + this.lineArray = lineArray; + } + } + // DIFF FUNCTIONS + /** + * The data structure representing a diff is a Linked list of Diff objects: + * {Diff(Operation.DELETE, "Hello"), Diff(Operation.INSERT, "Goodbye"), + * Diff(Operation.EQUAL, " world.")} + * which means: delete "Hello", add "Goodbye" and keep " world." + */ + public enum Operation { + DELETE, INSERT, EQUAL + } + /** + * Find the differences between two texts. + * Run a faster slightly less optimal diff + * This method allows the 'checklines' of diff_main() to be optional. + * Most of the time checklines is wanted, so default to true. + * @param text1 Old string to be diffed. + * @param text2 New string to be diffed. + * @return Linked List of Diff objects. + */ + public LinkedList diff_main(String text1, String text2) { + return diff_main(text1, text2, true); + } + /** + * Find the differences between two texts. Simplifies the problem by + * stripping any common prefix or suffix off the texts before diffing. + * @param text1 Old string to be diffed. + * @param text2 New string to be diffed. + * @param checklines Speedup flag. If false, then don't run a + * line-level diff first to identify the changed areas. + * If true, then run a faster slightly less optimal diff + * @return Linked List of Diff objects. + */ + public LinkedList diff_main(String text1, String text2, boolean checklines) { + // Check for equality (speedup) + LinkedList diffs; + if (text1.equals(text2)) { + diffs = new LinkedList(); + diffs.add(new Diff(Operation.EQUAL, text1)); + return diffs; + } + // Trim off common prefix (speedup) + int commonlength = diff_commonPrefix(text1, text2); + String commonprefix = text1.substring(0, commonlength); + text1 = text1.substring(commonlength); + text2 = text2.substring(commonlength); + // Trim off common suffix (speedup) + commonlength = diff_commonSuffix(text1, text2); + String commonsuffix = text1.substring(text1.length() - commonlength); + text1 = text1.substring(0, text1.length() - commonlength); + text2 = text2.substring(0, text2.length() - commonlength); + // Compute the diff on the middle block + diffs = diff_compute(text1, text2, checklines); + + // Restore the prefix and suffix + if (commonprefix.length() != 0) { + diffs.addFirst(new Diff(Operation.EQUAL, commonprefix)); + } + if (commonsuffix.length() != 0) { + diffs.addLast(new Diff(Operation.EQUAL, commonsuffix)); + } + diff_cleanupMerge(diffs); + return diffs; + } + /** + * Find the differences between two texts. Assumes that the texts do not + * have any common prefix or suffix. + * @param text1 Old string to be diffed. + * @param text2 New string to be diffed. + * @param checklines Speedup flag. If false, then don't run a + * line-level diff first to identify the changed areas. + * If true, then run a faster slightly less optimal diff + * @return Linked List of Diff objects. + */ + protected LinkedList diff_compute(String text1, String text2,boolean checklines) { + LinkedList diffs = new LinkedList(); + if (text1.length() == 0) { + // Just add some text (speedup) + diffs.add(new Diff(Operation.INSERT, text2)); + return diffs; + } + if (text2.length() == 0) { + // Just delete some text (speedup) + diffs.add(new Diff(Operation.DELETE, text1)); + return diffs; + } + String longtext = text1.length() > text2.length() ? text1 : text2; + String shorttext = text1.length() > text2.length() ? text2 : text1; + int i = longtext.indexOf(shorttext); + if (i != -1) { + // Shorter text is inside the longer text (speedup) + Operation op = (text1.length() > text2.length()) ? + Operation.DELETE : Operation.INSERT; + diffs.add(new Diff(op, longtext.substring(0, i))); + diffs.add(new Diff(Operation.EQUAL, shorttext)); + diffs.add(new Diff(op, longtext.substring(i + shorttext.length()))); + return diffs; + } + longtext = shorttext = null; // Garbage collect. + // Check to see if the problem can be split in two. + String[] hm = diff_halfMatch(text1, text2); + if (hm != null) { + // A half-match was found, sort out the return data. + String text1_a = hm[0]; + String text1_b = hm[1]; + String text2_a = hm[2]; + String text2_b = hm[3]; + String mid_common = hm[4]; + // Send both pairs off for separate processing. + LinkedList diffs_a = diff_main(text1_a, text2_a, checklines); + LinkedList diffs_b = diff_main(text1_b, text2_b, checklines); + // Merge the results. + diffs = diffs_a; + diffs.add(new Diff(Operation.EQUAL, mid_common)); + diffs.addAll(diffs_b); + return diffs; + } + // Perform a real diff. + if (checklines && (text1.length() < 100 || text2.length() < 100)) { + checklines = false; // Too trivial for the overhead. + } + List linearray = null; + if (checklines) { + // Scan the text on a line-by-line basis first. + LinesToCharsResult b = diff_linesToChars(text1, text2); + text1 = b.chars1; + text2 = b.chars2; + linearray = b.lineArray; + } + diffs = diff_map(text1, text2); + if (diffs == null) { + // No acceptable result. + diffs = new LinkedList(); + diffs.add(new Diff(Operation.DELETE, text1)); + diffs.add(new Diff(Operation.INSERT, text2)); + } + if (checklines) { + // Convert the diff back to original text. + diff_charsToLines(diffs, linearray); + // Eliminate freak matches (e.g. blank lines) + diff_cleanupSemantic(diffs); + // Rediff any replacement blocks, this time character-by-character. + // Add a dummy entry at the end. + diffs.add(new Diff(Operation.EQUAL, "")); + int count_delete = 0; + int count_insert = 0; + String text_delete = ""; + String text_insert = ""; + ListIterator pointer = diffs.listIterator(); + Diff thisDiff = pointer.next(); + while (thisDiff != null) { + switch (thisDiff.operation) { + case INSERT: + count_insert++; + text_insert += thisDiff.text; + break; + case DELETE: + count_delete++; + text_delete += thisDiff.text; + break; + case EQUAL: + // Upon reaching an equality, check for prior redundancies. + if (count_delete >= 1 && count_insert >= 1) { + // Delete the offending records and add the merged ones. + pointer.previous(); + for (int j = 0; j < count_delete + count_insert; j++) { + pointer.previous(); + pointer.remove(); + } + for (Diff newDiff : diff_main(text_delete, text_insert, false)) { + pointer.add(newDiff); + } + } + count_insert = 0; + count_delete = 0; + text_delete = ""; + text_insert = ""; + break; + } + thisDiff = pointer.hasNext() ? pointer.next() : null; + } + diffs.removeLast(); // Remove the dummy entry at the end. + } + return diffs; + } + /** + * Split two texts into a list of strings. Reduce the texts to a string of + * hashes where each Unicode character represents one line. + * @param text1 First string. + * @param text2 Second string. + * @return An object containing the encoded text1, the encoded text2 and + * the List of unique strings. The zeroth element of the List of + * unique strings is intentionally blank. + */ + protected LinesToCharsResult diff_linesToChars(String text1, String text2) { + List lineArray = new ArrayList(); + Map lineHash = new HashMap(); + // e.g. linearray[4] == "Hello\n" + // e.g. linehash.get("Hello\n") == 4 + // "\x00" is a valid character, but various debuggers don't like it. + // So we'll insert a junk entry to avoid generating a null character. + lineArray.add(""); + String chars1 = diff_linesToCharsMunge(text1, lineArray, lineHash); + String chars2 = diff_linesToCharsMunge(text2, lineArray, lineHash); + return new LinesToCharsResult(chars1, chars2, lineArray); + } + /** + * Split a text into a list of strings. Reduce the texts to a string of + * hashes where each Unicode character represents one line. + * @param text String to encode. + * @param lineArray List of unique strings. + * @param lineHash Map of strings to indices. + * @return Encoded string. + */ + private String diff_linesToCharsMunge(String text, List lineArray, + Map lineHash) { + int lineStart = 0; + int lineEnd = -1; + String line; + StringBuilder chars = new StringBuilder(); + // Walk the text, pulling out a substring for each line. + // text.split('\n') would would temporarily double our memory footprint. + // Modifying text would create many large strings to garbage collect. + while (lineEnd < text.length() - 1) { + lineEnd = text.indexOf('\n', lineStart); + if (lineEnd == -1) { + lineEnd = text.length() - 1; + } + line = text.substring(lineStart, lineEnd + 1); + lineStart = lineEnd + 1; + + if (lineHash.containsKey(line)) { + chars.append(String.valueOf((char) (int) lineHash.get(line))); + } else { + lineArray.add(line); + lineHash.put(line, lineArray.size() - 1); + chars.append(String.valueOf((char) (lineArray.size() - 1))); + } + } + return chars.toString(); + } + /** + * Rehydrate the text in a diff from a string of line hashes to real lines of + * text. + * @param diffs LinkedList of Diff objects. + * @param lineArray List of unique strings. + */ + protected void diff_charsToLines(LinkedList diffs, + List lineArray) { + StringBuilder text; + for (Diff diff : diffs) { + text = new StringBuilder(); + for (int y = 0; y < diff.text.length(); y++) { + text.append(lineArray.get(diff.text.charAt(y))); + } + diff.text = text.toString(); + } + } + /** + * Explore the intersection points between the two texts. + * @param text1 Old string to be diffed. + * @param text2 New string to be diffed. + * @return LinkedList of Diff objects or null if no diff available. + */ + protected LinkedList diff_map(String text1, String text2) { + long ms_end = System.currentTimeMillis() + (long) (Diff_Timeout * 1000); + // Cache the text lengths to prevent multiple calls. + int text1_length = text1.length(); + int text2_length = text2.length(); + int max_d = text1_length + text2_length - 1; + boolean doubleEnd = Diff_DualThreshold * 2 < max_d; + List> v_map1 = new ArrayList>(); + List> v_map2 = new ArrayList>(); + Map v1 = new HashMap(); + Map v2 = new HashMap(); + v1.put(1, 0); + v2.put(1, 0); + int x, y; + Long footstep = 0L; // Used to track overlapping paths. + Map footsteps = new HashMap(); + boolean done = false; + // If the total number of characters is odd, then the front path will + // collide with the reverse path. + boolean front = ((text1_length + text2_length) % 2 == 1); + for (int d = 0; d < max_d; d++) { + // Bail out if timeout reached. + if (Diff_Timeout > 0 && System.currentTimeMillis() > ms_end) { + return null; + } + + // Walk the front path one step. + v_map1.add(new HashSet()); // Adds at index 'd'. + for (int k = -d; k <= d; k += 2) { + if (k == -d || k != d && v1.get(k - 1) < v1.get(k + 1)) { + x = v1.get(k + 1); + } else { + x = v1.get(k - 1) + 1; + } + y = x - k; + if (doubleEnd) { + footstep = diff_footprint(x, y); + if (front && (footsteps.containsKey(footstep))) { + done = true; + } + if (!front) { + footsteps.put(footstep, d); + } + } + while (!done && x < text1_length && y < text2_length + && text1.charAt(x) == text2.charAt(y)) { + x++; + y++; + if (doubleEnd) { + footstep = diff_footprint(x, y); + if (front && (footsteps.containsKey(footstep))) { + done = true; + } + if (!front) { + footsteps.put(footstep, d); + } + } + } + v1.put(k, x); + v_map1.get(d).add(diff_footprint(x, y)); + if (x == text1_length && y == text2_length) { + // Reached the end in single-path mode. + return diff_path1(v_map1, text1, text2); + } else if (done) { + // Front path ran over reverse path. + v_map2 = v_map2.subList(0, footsteps.get(footstep) + 1); + LinkedList a = diff_path1(v_map1, text1.substring(0, x), + text2.substring(0, y)); + a.addAll(diff_path2(v_map2, text1.substring(x), text2.substring(y))); + return a; + } + } + if (doubleEnd) { + // Walk the reverse path one step. + v_map2.add(new HashSet()); // Adds at index 'd'. + for (int k = -d; k <= d; k += 2) { + if (k == -d || k != d && v2.get(k - 1) < v2.get(k + 1)) { + x = v2.get(k + 1); + } else { + x = v2.get(k - 1) + 1; + } + y = x - k; + footstep = diff_footprint(text1_length - x, text2_length - y); + if (!front && (footsteps.containsKey(footstep))) { + done = true; + } + if (front) { + footsteps.put(footstep, d); + } + while (!done && x < text1_length && y < text2_length + && text1.charAt(text1_length - x - 1) + == text2.charAt(text2_length - y - 1)) { + x++; + y++; + footstep = diff_footprint(text1_length - x, text2_length - y); + if (!front && (footsteps.containsKey(footstep))) { + done = true; + } + if (front) { + footsteps.put(footstep, d); + } + } + v2.put(k, x); + v_map2.get(d).add(diff_footprint(x, y)); + if (done) { + // Reverse path ran over front path. + v_map1 = v_map1.subList(0, footsteps.get(footstep) + 1); + LinkedList a + = diff_path1(v_map1, text1.substring(0, text1_length - x), + text2.substring(0, text2_length - y)); + a.addAll(diff_path2(v_map2, text1.substring(text1_length - x), + text2.substring(text2_length - y))); + return a; + } + } + } + } + // Number of diffs equals number of characters, no commonality at all. + return null; + } + /** + * Work from the middle back to the start to determine the path. + * @param v_map List of path sets. + * @param text1 Old string fragment to be diffed. + * @param text2 New string fragment to be diffed. + * @return LinkedList of Diff objects. + */ + protected LinkedList diff_path1(List> v_map, + String text1, String text2) { + LinkedList path = new LinkedList(); + int x = text1.length(); + int y = text2.length(); + Operation last_op = null; + for (int d = v_map.size() - 2; d >= 0; d--) { + while (true) { + if (v_map.get(d).contains(diff_footprint(x - 1, y))) { + x--; + if (last_op == Operation.DELETE) { + path.getFirst().text = text1.charAt(x) + path.getFirst().text; + } else { + path.addFirst(new Diff(Operation.DELETE, + text1.substring(x, x + 1))); + } + last_op = Operation.DELETE; + break; + } else if (v_map.get(d).contains(diff_footprint(x, y - 1))) { + y--; + if (last_op == Operation.INSERT) { + path.getFirst().text = text2.charAt(y) + path.getFirst().text; + } else { + path.addFirst(new Diff(Operation.INSERT, + text2.substring(y, y + 1))); + } + last_op = Operation.INSERT; + break; + } else { + x--; + y--; + assert (text1.charAt(x) == text2.charAt(y)) + : "No diagonal. Can't happen. (diff_path1)"; + if (last_op == Operation.EQUAL) { + path.getFirst().text = text1.charAt(x) + path.getFirst().text; + } else { + path.addFirst(new Diff(Operation.EQUAL, text1.substring(x, x + 1))); + } + last_op = Operation.EQUAL; + } + } + } + return path; + } + /** + * Work from the middle back to the end to determine the path. + * @param v_map List of path sets. + * @param text1 Old string fragment to be diffed. + * @param text2 New string fragment to be diffed. + * @return LinkedList of Diff objects. + */ + protected LinkedList diff_path2(List> v_map, + String text1, String text2) { + LinkedList path = new LinkedList(); + int x = text1.length(); + int y = text2.length(); + Operation last_op = null; + for (int d = v_map.size() - 2; d >= 0; d--) { + while (true) { + if (v_map.get(d).contains(diff_footprint(x - 1, y))) { + x--; + if (last_op == Operation.DELETE) { + path.getLast().text += text1.charAt(text1.length() - x - 1); + } else { + path.addLast(new Diff(Operation.DELETE, + text1.substring(text1.length() - x - 1, text1.length() - x))); + } + last_op = Operation.DELETE; + break; + } else if (v_map.get(d).contains(diff_footprint(x, y - 1))) { + y--; + if (last_op == Operation.INSERT) { + path.getLast().text += text2.charAt(text2.length() - y - 1); + } else { + path.addLast(new Diff(Operation.INSERT, + text2.substring(text2.length() - y - 1, text2.length() - y))); + } + last_op = Operation.INSERT; + break; + } else { + x--; + y--; + assert (text1.charAt(text1.length() - x - 1) + == text2.charAt(text2.length() - y - 1)) + : "No diagonal. Can't happen. (diff_path2)"; + if (last_op == Operation.EQUAL) { + path.getLast().text += text1.charAt(text1.length() - x - 1); + } else { + path.addLast(new Diff(Operation.EQUAL, + text1.substring(text1.length() - x - 1, text1.length() - x))); + } + last_op = Operation.EQUAL; + } + } + } + return path; + } + /** + * Compute a good hash of two integers. + * @param x First int. + * @param y Second int. + * @return A long made up of both ints. + */ + protected long diff_footprint(int x, int y) { + // The maximum size for a long is 9,223,372,036,854,775,807 + // The maximum size for an int is 2,147,483,647 + // Two ints fit nicely in one long. + long result = x; + result = result << 32; + result += y; + return result; + } + /** + * Determine the common prefix of two strings + * @param text1 First string. + * @param text2 Second string. + * @return The number of characters common to the start of each string. + */ + public int diff_commonPrefix(String text1, String text2) { + // Performance analysis: http://neil.fraser.name/news/2007/10/09/ + int n = Math.min(text1.length(), text2.length()); + for (int i = 0; i < n; i++) { + if (text1.charAt(i) != text2.charAt(i)) { + return i; + } + } + return n; + } + /** + * Determine the common suffix of two strings + * @param text1 First string. + * @param text2 Second string. + * @return The number of characters common to the end of each string. + */ + public int diff_commonSuffix(String text1, String text2) { + // Performance analysis: http://neil.fraser.name/news/2007/10/09/ + int text1_length = text1.length(); + int text2_length = text2.length(); + int n = Math.min(text1_length, text2_length); + for (int i = 1; i <= n; i++) { + if (text1.charAt(text1_length - i) != text2.charAt(text2_length - i)) { + return i - 1; + } + } + return n; + } + /** + * Do the two texts share a substring which is at least half the length of + * the longer text? + * @param text1 First string. + * @param text2 Second string. + * @return Five element String array, containing the prefix of text1, the + * suffix of text1, the prefix of text2, the suffix of text2 and the + * common middle. Or null if there was no match. + */ + protected String[] diff_halfMatch(String text1, String text2) { + String longtext = text1.length() > text2.length() ? text1 : text2; + String shorttext = text1.length() > text2.length() ? text2 : text1; + if (longtext.length() < 10 || shorttext.length() < 1) { + return null; // Pointless. + } + + // First check if the second quarter is the seed for a half-match. + String[] hm1 = diff_halfMatchI(longtext, shorttext, + (longtext.length() + 3) / 4); + // Check again based on the third quarter. + String[] hm2 = diff_halfMatchI(longtext, shorttext, + (longtext.length() + 1) / 2); + String[] hm; + if (hm1 == null && hm2 == null) { + return null; + } else if (hm2 == null) { + hm = hm1; + } else if (hm1 == null) { + hm = hm2; + } else { + // Both matched. Select the longest. + hm = hm1[4].length() > hm2[4].length() ? hm1 : hm2; + } + // A half-match was found, sort out the return data. + if (text1.length() > text2.length()) { + return hm; + //return new String[]{hm[0], hm[1], hm[2], hm[3], hm[4]}; + } else { + return new String[]{hm[2], hm[3], hm[0], hm[1], hm[4]}; + } + } + /** + * Does a substring of shorttext exist within longtext such that the + * substring is at least half the length of longtext? + * @param longtext Longer string. + * @param shorttext Shorter string. + * @param i Start index of quarter length substring within longtext. + * @return Five element String array, containing the prefix of longtext, the + * suffix of longtext, the prefix of shorttext, the suffix of shorttext + * and the common middle. Or null if there was no match. + */ + private String[] diff_halfMatchI(String longtext, String shorttext, int i) { + // Start with a 1/4 length substring at position i as a seed. + String seed = longtext.substring(i, i + longtext.length() / 4); + int j = -1; + String best_common = ""; + String best_longtext_a = "", best_longtext_b = ""; + String best_shorttext_a = "", best_shorttext_b = ""; + while ((j = shorttext.indexOf(seed, j + 1)) != -1) { + int prefixLength = diff_commonPrefix(longtext.substring(i), shorttext.substring(j)); + int suffixLength = diff_commonSuffix(longtext.substring(0, i), + shorttext.substring(0, j)); + if (best_common.length() < suffixLength + prefixLength) { + best_common = shorttext.substring(j - suffixLength, j) + + shorttext.substring(j, j + prefixLength); + best_longtext_a = longtext.substring(0, i - suffixLength); + best_longtext_b = longtext.substring(i + prefixLength); + best_shorttext_a = shorttext.substring(0, j - suffixLength); + best_shorttext_b = shorttext.substring(j + prefixLength); + } + } + if (best_common.length() >= longtext.length() / 2) { + return new String[]{best_longtext_a, best_longtext_b, + best_shorttext_a, best_shorttext_b, best_common}; + } else { + return null; + } + } + /** + * Reduce the number of edits by eliminating semantically trivial equalities. + * @param diffs LinkedList of Diff objects. + */ + public void diff_cleanupSemantic(LinkedList diffs) { + if (diffs.isEmpty()) { + return; + } + boolean changes = false; + Stack equalities = new Stack(); // Stack of qualities. + String lastequality = null; // Always equal to equalities.lastElement().text + ListIterator pointer = diffs.listIterator(); + // Number of characters that changed prior to the equality. + int length_changes1 = 0; + // Number of characters that changed after the equality. + int length_changes2 = 0; + Diff thisDiff = pointer.next(); + while (thisDiff != null) { + if (thisDiff.operation == Operation.EQUAL) { + // equality found + equalities.push(thisDiff); + length_changes1 = length_changes2; + length_changes2 = 0; + lastequality = thisDiff.text; + } else { + // an insertion or deletion + length_changes2 += thisDiff.text.length(); + if (lastequality != null && (lastequality.length() <= length_changes1) + && (lastequality.length() <= length_changes2)) { + //System.out.println("Splitting: '" + lastequality + "'"); + // Walk back to offending equality. + while (thisDiff != equalities.lastElement()) { + thisDiff = pointer.previous(); + } + pointer.next(); + // Replace equality with a delete. + pointer.set(new Diff(Operation.DELETE, lastequality)); + // Insert a corresponding an insert. + pointer.add(new Diff(Operation.INSERT, lastequality)); + + equalities.pop(); // Throw away the equality we just deleted. + if (!equalities.empty()) { + // Throw away the previous equality (it needs to be reevaluated). + equalities.pop(); + } + if (equalities.empty()) { + // There are no previous equalities, walk back to the start. + while (pointer.hasPrevious()) { + pointer.previous(); + } + } else { + // There is a safe equality we can fall back to. + thisDiff = equalities.lastElement(); + while (thisDiff != pointer.previous()) { + // Intentionally empty loop. + } + } + length_changes1 = 0; // Reset the counters. + length_changes2 = 0; + lastequality = null; + changes = true; + } + } + thisDiff = pointer.hasNext() ? pointer.next() : null; + } + if (changes) { + diff_cleanupMerge(diffs); + } + diff_cleanupSemanticLossless(diffs); + } + /** + * Look for single edits surrounded on both sides by equalities + * which can be shifted sideways to align the edit to a word boundary. + * e.g: The cat came. -> The cat came. + * @param diffs LinkedList of Diff objects. + */ + public void diff_cleanupSemanticLossless(LinkedList diffs) { + String equality1, edit, equality2; + String commonString; + int commonOffset; + int score, bestScore; + String bestEquality1, bestEdit, bestEquality2; + // Create a new iterator at the start. + ListIterator pointer = diffs.listIterator(); + Diff prevDiff = pointer.hasNext() ? pointer.next() : null; + Diff thisDiff = pointer.hasNext() ? pointer.next() : null; + Diff nextDiff = pointer.hasNext() ? pointer.next() : null; + // Intentionally ignore the first and last element (don't need checking). + while (nextDiff != null) { + if (prevDiff.operation == Operation.EQUAL && + nextDiff.operation == Operation.EQUAL) { + // This is a single edit surrounded by equalities. + equality1 = prevDiff.text; + edit = thisDiff.text; + equality2 = nextDiff.text; + + // First, shift the edit as far left as possible. + commonOffset = diff_commonSuffix(equality1, edit); + if (commonOffset != 0) { + commonString = edit.substring(edit.length() - commonOffset); + equality1 = equality1.substring(0, equality1.length() - commonOffset); + edit = commonString + edit.substring(0, edit.length() - commonOffset); + equality2 = commonString + equality2; + } + // Second, step character by character right, looking for the best fit. + bestEquality1 = equality1; + bestEdit = edit; + bestEquality2 = equality2; + bestScore = diff_cleanupSemanticScore(equality1, edit) + + diff_cleanupSemanticScore(edit, equality2); + while (edit.length() != 0 && equality2.length() != 0 + && edit.charAt(0) == equality2.charAt(0)) { + equality1 += edit.charAt(0); + edit = edit.substring(1) + equality2.charAt(0); + equality2 = equality2.substring(1); + score = diff_cleanupSemanticScore(equality1, edit) + + diff_cleanupSemanticScore(edit, equality2); + // The >= encourages trailing rather than leading whitespace on edits. + if (score >= bestScore) { + bestScore = score; + bestEquality1 = equality1; + bestEdit = edit; + bestEquality2 = equality2; + } + } + + if (!prevDiff.text.equals(bestEquality1)) { + // We have an improvement, save it back to the diff. + if (bestEquality1.length() != 0) { + prevDiff.text = bestEquality1; + } else { + pointer.previous(); // Walk past nextDiff. + pointer.previous(); // Walk past thisDiff. + pointer.previous(); // Walk past prevDiff. + pointer.remove(); // Delete prevDiff. + pointer.next(); // Walk past thisDiff. + pointer.next(); // Walk past nextDiff. + } + thisDiff.text = bestEdit; + if (bestEquality2.length() != 0) { + nextDiff.text = bestEquality2; + } else { + pointer.remove(); // Delete nextDiff. + nextDiff = thisDiff; + thisDiff = prevDiff; + } + } + } + prevDiff = thisDiff; + thisDiff = nextDiff; + nextDiff = pointer.hasNext() ? pointer.next() : null; + } + } + /** + * Given two strings, compute a score representing whether the internal + * boundary falls on logical boundaries. + * Scores range from 5 (best) to 0 (worst). + * @param one First string. + * @param two Second string. + * @return The score. + */ + private int diff_cleanupSemanticScore(String one, String two) { + if (one.length() == 0 || two.length() == 0) { + // Edges are the best. + return 5; + } + // Each port of this function behaves slightly differently due to + // subtle differences in each language's definition of things like + // 'whitespace'. Since this function's purpose is largely cosmetic, + // the choice has been made to use each language's native features + // rather than force total conformity. + int score = 0; + // One point for non-alphanumeric. + if (!Character.isLetterOrDigit(one.charAt(one.length() - 1)) + || !Character.isLetterOrDigit(two.charAt(0))) { + score++; + // Two points for whitespace. + if (Character.isWhitespace(one.charAt(one.length() - 1)) + || Character.isWhitespace(two.charAt(0))) { + score++; + // Three points for line breaks. + if (Character.getType(one.charAt(one.length() - 1)) == Character.CONTROL + || Character.getType(two.charAt(0)) == Character.CONTROL) { + score++; + // Four points for blank lines. + if (BLANKLINEEND.matcher(one).find() + || BLANKLINESTART.matcher(two).find()) { + score++; + } + } + } + } + return score; + } + private Pattern BLANKLINEEND + = Pattern.compile("\\n\\r?\\n\\Z", Pattern.DOTALL); + private Pattern BLANKLINESTART + = Pattern.compile("\\A\\r?\\n\\r?\\n", Pattern.DOTALL); + /** + * Reduce the number of edits by eliminating operationally trivial equalities. + * @param diffs LinkedList of Diff objects. + */ + public void diff_cleanupEfficiency(LinkedList diffs) { + if (diffs.isEmpty()) { + return; + } + boolean changes = false; + Stack equalities = new Stack(); // Stack of equalities. + String lastequality = null; // Always equal to equalities.lastElement().text + ListIterator pointer = diffs.listIterator(); + // Is there an insertion operation before the last equality. + boolean pre_ins = false; + // Is there a deletion operation before the last equality. + boolean pre_del = false; + // Is there an insertion operation after the last equality. + boolean post_ins = false; + // Is there a deletion operation after the last equality. + boolean post_del = false; + Diff thisDiff = pointer.next(); + Diff safeDiff = thisDiff; // The last Diff that is known to be unsplitable. + while (thisDiff != null) { + if (thisDiff.operation == Operation.EQUAL) { + // equality found + if (thisDiff.text.length() < Diff_EditCost && (post_ins || post_del)) { + // Candidate found. + equalities.push(thisDiff); + pre_ins = post_ins; + pre_del = post_del; + lastequality = thisDiff.text; + } else { + // Not a candidate, and can never become one. + equalities.clear(); + lastequality = null; + safeDiff = thisDiff; + } + post_ins = post_del = false; + } else { + // an insertion or deletion + if (thisDiff.operation == Operation.DELETE) { + post_del = true; + } else { + post_ins = true; + } + /* + * Five types to be split: + * ABXYCD + * AXCD + * ABXC + * AXCD + * ABXC + */ + if (lastequality != null + && ((pre_ins && pre_del && post_ins && post_del) + || ((lastequality.length() < Diff_EditCost / 2) + && ((pre_ins ? 1 : 0) + (pre_del ? 1 : 0) + + (post_ins ? 1 : 0) + (post_del ? 1 : 0)) == 3))) { + //System.out.println("Splitting: '" + lastequality + "'"); + // Walk back to offending equality. + while (thisDiff != equalities.lastElement()) { + thisDiff = pointer.previous(); + } + pointer.next(); + + // Replace equality with a delete. + pointer.set(new Diff(Operation.DELETE, lastequality)); + // Insert a corresponding an insert. + pointer.add(thisDiff = new Diff(Operation.INSERT, lastequality)); + + equalities.pop(); // Throw away the equality we just deleted. + lastequality = null; + if (pre_ins && pre_del) { + // No changes made which could affect previous entry, keep going. + post_ins = post_del = true; + equalities.clear(); + safeDiff = thisDiff; + } else { + if (!equalities.empty()) { + // Throw away the previous equality (it needs to be reevaluated). + equalities.pop(); + } + if (equalities.empty()) { + // There are no previous questionable equalities, + // walk back to the last known safe diff. + thisDiff = safeDiff; + } else { + // There is an equality we can fall back to. + thisDiff = equalities.lastElement(); + } + while (thisDiff != pointer.previous()) { + // Intentionally empty loop. + } + post_ins = post_del = false; + } + changes = true; + } + } + thisDiff = pointer.hasNext() ? pointer.next() : null; + } + if (changes) { + diff_cleanupMerge(diffs); + } + } + /** + * Reorder and merge like edit sections. Merge equalities. + * Any edit section can move as long as it doesn't cross an equality. + * @param diffs LinkedList of Diff objects. + */ + public void diff_cleanupMerge(LinkedList diffs) { + diffs.add(new Diff(Operation.EQUAL, "")); // Add a dummy entry at the end. + ListIterator pointer = diffs.listIterator(); + int count_delete = 0; + int count_insert = 0; + String text_delete = ""; + String text_insert = ""; + Diff thisDiff = pointer.next(); + Diff prevEqual = null; + int commonlength; + while (thisDiff != null) { + switch (thisDiff.operation) { + case INSERT: + count_insert++; + text_insert += thisDiff.text; + prevEqual = null; + break; + case DELETE: + count_delete++; + text_delete += thisDiff.text; + prevEqual = null; + break; + case EQUAL: + if (count_delete != 0 || count_insert != 0) { + // Delete the offending records. + pointer.previous(); // Reverse direction. + while (count_delete-- > 0) { + pointer.previous(); + pointer.remove(); + } + while (count_insert-- > 0) { + pointer.previous(); + pointer.remove(); + } + if (count_delete != 0 && count_insert != 0) { + // Factor out any common prefixies. + commonlength = diff_commonPrefix(text_insert, text_delete); + if (commonlength != 0) { + if (pointer.hasPrevious()) { + thisDiff = pointer.previous(); + assert thisDiff.operation == Operation.EQUAL + : "Previous diff should have been an equality."; + thisDiff.text += text_insert.substring(0, commonlength); + pointer.next(); + } else { + pointer.add(new Diff(Operation.EQUAL, + text_insert.substring(0, commonlength))); + } + text_insert = text_insert.substring(commonlength); + text_delete = text_delete.substring(commonlength); + } + // Factor out any common suffixies. + commonlength = diff_commonSuffix(text_insert, text_delete); + if (commonlength != 0) { + thisDiff = pointer.next(); + thisDiff.text = text_insert.substring(text_insert.length() + - commonlength) + thisDiff.text; + text_insert = text_insert.substring(0, text_insert.length() + - commonlength); + text_delete = text_delete.substring(0, text_delete.length() + - commonlength); + pointer.previous(); + } + } + // Insert the merged records. + if (text_delete.length() != 0) { + pointer.add(new Diff(Operation.DELETE, text_delete)); + } + if (text_insert.length() != 0) { + pointer.add(new Diff(Operation.INSERT, text_insert)); + } + // Step forward to the equality. + thisDiff = pointer.hasNext() ? pointer.next() : null; + } else if (prevEqual != null) { + // Merge this equality with the previous one. + prevEqual.text += thisDiff.text; + pointer.remove(); + thisDiff = pointer.previous(); + pointer.next(); // Forward direction + } + count_insert = 0; + count_delete = 0; + text_delete = ""; + text_insert = ""; + prevEqual = thisDiff; + break; + } + thisDiff = pointer.hasNext() ? pointer.next() : null; + } + // System.out.println(diff); + if (diffs.getLast().text.length() == 0) { + diffs.removeLast(); // Remove the dummy entry at the end. + } + /* + * Second pass: look for single edits surrounded on both sides by equalities + * which can be shifted sideways to eliminate an equality. + * e.g: ABAC -> ABAC + */ + boolean changes = false; + // Create a new iterator at the start. + // (As opposed to walking the current one back.) + pointer = diffs.listIterator(); + Diff prevDiff = pointer.hasNext() ? pointer.next() : null; + thisDiff = pointer.hasNext() ? pointer.next() : null; + Diff nextDiff = pointer.hasNext() ? pointer.next() : null; + // Intentionally ignore the first and last element (don't need checking). + while (nextDiff != null) { + if (prevDiff.operation == Operation.EQUAL && + nextDiff.operation == Operation.EQUAL) { + // This is a single edit surrounded by equalities. + if (thisDiff.text.endsWith(prevDiff.text)) { + // Shift the edit over the previous equality. + thisDiff.text = prevDiff.text + thisDiff.text.substring(0, thisDiff.text.length() - prevDiff.text.length()); + nextDiff.text = prevDiff.text + nextDiff.text; + pointer.previous(); // Walk past nextDiff. + pointer.previous(); // Walk past thisDiff. + pointer.previous(); // Walk past prevDiff. + pointer.remove(); // Delete prevDiff. + pointer.next(); // Walk past thisDiff. + thisDiff = pointer.next(); // Walk past nextDiff. + nextDiff = pointer.hasNext() ? pointer.next() : null; + changes = true; + } else if (thisDiff.text.startsWith(nextDiff.text)) { + // Shift the edit over the next equality. + prevDiff.text += nextDiff.text; + thisDiff.text = thisDiff.text.substring(nextDiff.text.length()) + + nextDiff.text; + pointer.remove(); // Delete nextDiff. + nextDiff = pointer.hasNext() ? pointer.next() : null; + changes = true; + } + } + prevDiff = thisDiff; + thisDiff = nextDiff; + nextDiff = pointer.hasNext() ? pointer.next() : null; + } + // If shifts were made, the diff needs reordering and another shift sweep. + if (changes) { + diff_cleanupMerge(diffs); + } + } + /** + * loc is a location in text1, compute and return the equivalent location in + * text2. + * e.g. "The cat" vs "The big cat", 1->1, 5->8 + * @param diffs LinkedList of Diff objects. + * @param loc Location within text1. + * @return Location within text2. + */ + public int diff_xIndex(LinkedList diffs, int loc) { + int chars1 = 0; + int chars2 = 0; + int last_chars1 = 0; + int last_chars2 = 0; + Diff lastDiff = null; + for (Diff aDiff : diffs) { + if (aDiff.operation != Operation.INSERT) { + // Equality or deletion. + chars1 += aDiff.text.length(); + } + if (aDiff.operation != Operation.DELETE) { + // Equality or insertion. + chars2 += aDiff.text.length(); + } + if (chars1 > loc) { + // Overshot the location. + lastDiff = aDiff; + break; + } + last_chars1 = chars1; + last_chars2 = chars2; + } + if (lastDiff != null && lastDiff.operation == Operation.DELETE) { + // The location was deleted. + return last_chars2; + } + // Add the remaining character length. + return last_chars2 + (loc - last_chars1); + } + /** + * Convert a Diff list into a pretty HTML report. + * @param diffs LinkedList of Diff objects. + * @return HTML representation. + */ + public String diff_prettyHtml(LinkedList diffs) { + StringBuilder html = new StringBuilder(); + int i = 0; + for (Diff aDiff : diffs) { + String text = aDiff.text.replace("&", "&").replace("<", "<") + .replace(">", ">").replace("\n", "¶
    "); + switch (aDiff.operation) { + case INSERT: + html.append("").append(text).append(""); + break; + case DELETE: + html.append("").append(text).append(""); + break; + case EQUAL: + html.append("").append(text) + .append(""); + break; + } + if (aDiff.operation != Operation.DELETE) { + i += aDiff.text.length(); + } + } + return html.toString(); + } + /** + * Compute and return the source text (all equalities and deletions). + * @param diffs LinkedList of Diff objects. + * @return Source text. + */ + public String diff_text1(LinkedList diffs) { + StringBuilder text = new StringBuilder(); + for (Diff aDiff : diffs) { + if (aDiff.operation != Operation.INSERT) { + text.append(aDiff.text); + } + } + return text.toString(); + } + /** + * Compute and return the destination text (all equalities and insertions). + * @param diffs LinkedList of Diff objects. + * @return Destination text. + */ + public String diff_text2(LinkedList diffs) { + StringBuilder text = new StringBuilder(); + for (Diff aDiff : diffs) { + if (aDiff.operation != Operation.DELETE) { + text.append(aDiff.text); + } + } + return text.toString(); + } + /** + * Compute the Levenshtein distance; the number of inserted, deleted or + * substituted characters. + * @param diffs LinkedList of Diff objects. + * @return Number of changes. + */ + public int diff_levenshtein(LinkedList diffs) { + int levenshtein = 0; + int insertions = 0; + int deletions = 0; + for (Diff aDiff : diffs) { + switch (aDiff.operation) { + case INSERT: + insertions += aDiff.text.length(); + break; + case DELETE: + deletions += aDiff.text.length(); + break; + case EQUAL: + // A deletion and an insertion is one substitution. + levenshtein += Math.max(insertions, deletions); + insertions = 0; + deletions = 0; + break; + } + } + levenshtein += Math.max(insertions, deletions); + return levenshtein; + } + /** + * Crush the diff into an encoded string which describes the operations + * required to transform text1 into text2. + * E.g. =3\t-2\t+ing -> Keep 3 chars, delete 2 chars, insert 'ing'. + * Operations are tab-separated. Inserted text is escaped using %xx notation. + * @param diffs Array of diff tuples. + * @return Delta text. + */ + public String diff_toDelta(LinkedList diffs) { + StringBuilder text = new StringBuilder(); + for (Diff aDiff : diffs) { + switch (aDiff.operation) { + case INSERT: + try { + text.append("+").append(URLEncoder.encode(aDiff.text, "UTF-8") + .replace('+', ' ')).append("\t"); + } catch (UnsupportedEncodingException e) { + // Not likely on modern system. + throw new Error("This system does not support UTF-8.", e); + } + break; + case DELETE: + text.append("-").append(aDiff.text.length()).append("\t"); + break; + case EQUAL: + text.append("=").append(aDiff.text.length()).append("\t"); + break; + } + } + String delta = text.toString(); + if (delta.length() != 0) { + // Strip off trailing tab character. + delta = delta.substring(0, delta.length() - 1); + delta = unescapeForEncodeUriCompatability(delta); + } + return delta; + } + /** + * Given the original text1, and an encoded string which describes the + * operations required to transform text1 into text2, compute the full diff. + * @param text1 Source string for the diff. + * @param delta Delta text. + * @return Array of diff tuples or null if invalid. + * @throws IllegalArgumentException If invalid input. + */ + public LinkedList diff_fromDelta(String text1, String delta) + throws IllegalArgumentException { + LinkedList diffs = new LinkedList(); + int pointer = 0; // Cursor in text1 + String[] tokens = delta.split("\t"); + for (String token : tokens) { + if (token.length() == 0) { + // Blank tokens are ok (from a trailing \t). + continue; + } + // Each token begins with a one character parameter which specifies the + // operation of this token (delete, insert, equality). + String param = token.substring(1); + switch (token.charAt(0)) { + case '+': + // decode would change all "+" to " " + param = param.replace("+", "%2B"); + try { + param = URLDecoder.decode(param, "UTF-8"); + } catch (UnsupportedEncodingException e) { + // Not likely on modern system. + throw new Error("This system does not support UTF-8.", e); + } catch (IllegalArgumentException e) { + // Malformed URI sequence. + throw new IllegalArgumentException( + "Illegal escape in diff_fromDelta: " + param, e); + } + diffs.add(new Diff(Operation.INSERT, param)); + break; + case '-': + // Fall through. + case '=': + int n; + try { + n = Integer.parseInt(param); + } catch (NumberFormatException e) { + throw new IllegalArgumentException( + "Invalid number in diff_fromDelta: " + param, e); + } + if (n < 0) { + throw new IllegalArgumentException( + "Negative number in diff_fromDelta: " + param); + } + String text; + try { + text = text1.substring(pointer, pointer += n); + } catch (StringIndexOutOfBoundsException e) { + throw new IllegalArgumentException("Delta length (" + pointer + + ") larger than source text length (" + text1.length() + + ").", e); + } + if (token.charAt(0) == '=') { + diffs.add(new Diff(Operation.EQUAL, text)); + } else { + diffs.add(new Diff(Operation.DELETE, text)); + } + break; + default: + // Anything else is an error. + throw new IllegalArgumentException( + "Invalid diff operation in diff_fromDelta: " + token.charAt(0)); + } + } + if (pointer != text1.length()) { + throw new IllegalArgumentException("Delta length (" + pointer + + ") smaller than source text length (" + text1.length() + ")."); + } + return diffs; + } + // MATCH FUNCTIONS + /** + * Locate the best instance of 'pattern' in 'text' near 'loc'. + * Returns -1 if no match found. + * @param text The text to search. + * @param pattern The pattern to search for. + * @param loc The location to search around. + * @return Best match index or -1. + */ + public int match_main(String text, String pattern, int loc) { + loc = Math.max(0, Math.min(loc, text.length())); + if (text.equals(pattern)) { + // Shortcut (potentially not guaranteed by the algorithm) + return 0; + } else if (text.length() == 0) { + // Nothing to match. + return -1; + } else if (loc + pattern.length() <= text.length() + && text.substring(loc, loc + pattern.length()).equals(pattern)) { + // Perfect match at the perfect spot! (Includes case of null pattern) + return loc; + } else { + // Do a fuzzy compare. + return match_bitap(text, pattern, loc); + } + } + /** + * Locate the best instance of 'pattern' in 'text' near 'loc' using the + * Bitap algorithm. Returns -1 if no match found. + * @param text The text to search. + * @param pattern The pattern to search for. + * @param loc The location to search around. + * @return Best match index or -1. + */ + protected int match_bitap(String text, String pattern, int loc) { + assert (Match_MaxBits == 0 || pattern.length() <= Match_MaxBits) + : "Pattern too long for this application."; + // Initialise the alphabet. + Map s = match_alphabet(pattern); + // Highest score beyond which we give up. + double score_threshold = Match_Threshold; + // Is there a nearby exact match? (speedup) + int best_loc = text.indexOf(pattern, loc); + if (best_loc != -1) { + score_threshold = Math.min(match_bitapScore(0, best_loc, loc, pattern), + score_threshold); + // What about in the other direction? (speedup) + best_loc = text.lastIndexOf(pattern, loc + pattern.length()); + if (best_loc != -1) { + score_threshold = Math.min(match_bitapScore(0, best_loc, loc, pattern), + score_threshold); + } + } + // Initialise the bit arrays. + int matchmask = 1 << (pattern.length() - 1); + best_loc = -1; + int bin_min, bin_mid; + int bin_max = pattern.length() + text.length(); + // Empty initialization added to appease Java compiler. + int[] last_rd = new int[0]; + for (int d = 0; d < pattern.length(); d++) { + // Scan for the best match; each iteration allows for one more error. + // Run a binary search to determine how far from 'loc' we can stray at + // this error level. + bin_min = 0; + bin_mid = bin_max; + while (bin_min < bin_mid) { + if (match_bitapScore(d, loc + bin_mid, loc, pattern) + <= score_threshold) { + bin_min = bin_mid; + } else { + bin_max = bin_mid; + } + bin_mid = (bin_max - bin_min) / 2 + bin_min; + } + // Use the result from this iteration as the maximum for the next. + bin_max = bin_mid; + int start = Math.max(1, loc - bin_mid + 1); + int finish = Math.min(loc + bin_mid, text.length()) + pattern.length(); + int[] rd = new int[finish + 2]; + rd[finish + 1] = (1 << d) - 1; + for (int j = finish; j >= start; j--) { + int charMatch; + if (text.length() <= j - 1 || !s.containsKey(text.charAt(j - 1))) { + // Out of range. + charMatch = 0; + } else { + charMatch = s.get(text.charAt(j - 1)); + } + if (d == 0) { + // First pass: exact match. + rd[j] = ((rd[j + 1] << 1) | 1) & charMatch; + } else { + // Subsequent passes: fuzzy match. + rd[j] = ((rd[j + 1] << 1) | 1) & charMatch + | (((last_rd[j + 1] | last_rd[j]) << 1) | 1) | last_rd[j + 1]; + } + if ((rd[j] & matchmask) != 0) { + double score = match_bitapScore(d, j - 1, loc, pattern); + // This match will almost certainly be better than any existing + // match. But check anyway. + if (score <= score_threshold) { + // Told you so. + score_threshold = score; + best_loc = j - 1; + if (best_loc > loc) { + // When passing loc, don't exceed our current distance from loc. + start = Math.max(1, 2 * loc - best_loc); + } else { + // Already passed loc, downhill from here on in. + break; + } + } + } + } + if (match_bitapScore(d + 1, loc, loc, pattern) > score_threshold) { + // No hope for a (better) match at greater error levels. + break; + } + last_rd = rd; + } + return best_loc; + } + /** + * Compute and return the score for a match with e errors and x location. + * @param e Number of errors in match. + * @param x Location of match. + * @param loc Expected location of match. + * @param pattern Pattern being sought. + * @return Overall score for match (0.0 = good, 1.0 = bad). + */ + private double match_bitapScore(int e, int x, int loc, String pattern) { + float accuracy = (float) e / pattern.length(); + int proximity = Math.abs(loc - x); + if (Match_Distance == 0) { + // Dodge divide by zero error. + return proximity == 0 ? accuracy : 1.0; + } + return accuracy + (proximity / (float) Match_Distance); + } + /** + * Initialise the alphabet for the Bitap algorithm. + * @param pattern The text to encode. + * @return Hash of character locations. + */ + protected Map match_alphabet(String pattern) { + Map s = new HashMap(); + char[] char_pattern = pattern.toCharArray(); + for (char c : char_pattern) { + s.put(c, 0); + } + int i = 0; + for (char c : char_pattern) { + s.put(c, s.get(c) | (1 << (pattern.length() - i - 1))); + i++; + } + return s; + } + // PATCH FUNCTIONS + /** + * Increase the context until it is unique, + * but don't let the pattern expand beyond Match_MaxBits. + * @param patch The patch to grow. + * @param text Source text. + */ + protected void patch_addContext(Patch patch, String text) { + if (text.length() == 0) { + return; + } + String pattern = text.substring(patch.start2, patch.start2 + patch.length1); + int padding = 0; + // Look for the first and last matches of pattern in text. If two different + // matches are found, increase the pattern length. + while (text.indexOf(pattern) != text.lastIndexOf(pattern) + && pattern.length() < Match_MaxBits - Patch_Margin - Patch_Margin) { + padding += Patch_Margin; + pattern = text.substring(Math.max(0, patch.start2 - padding), + Math.min(text.length(), patch.start2 + patch.length1 + padding)); + } + // Add one chunk for good luck. + padding += Patch_Margin; + // Add the prefix. + String prefix = text.substring(Math.max(0, patch.start2 - padding), + patch.start2); + if (prefix.length() != 0) { + patch.diffs.addFirst(new Diff(Operation.EQUAL, prefix)); + } + // Add the suffix. + String suffix = text.substring(patch.start2 + patch.length1, + Math.min(text.length(), patch.start2 + patch.length1 + padding)); + if (suffix.length() != 0) { + patch.diffs.addLast(new Diff(Operation.EQUAL, suffix)); + } + // Roll back the start points. + patch.start1 -= prefix.length(); + patch.start2 -= prefix.length(); + // Extend the lengths. + patch.length1 += prefix.length() + suffix.length(); + patch.length2 += prefix.length() + suffix.length(); + } + /** + * Compute a list of patches to turn text1 into text2. + * A set of diffs will be computed. + * @param text1 Old text. + * @param text2 New text. + * @return LinkedList of Patch objects. + */ + public LinkedList patch_make(String text1, String text2) { + // No diffs provided, compute our own. + LinkedList diffs = diff_main(text1, text2, true); + if (diffs.size() > 2) { + diff_cleanupSemantic(diffs); + diff_cleanupEfficiency(diffs); + } + return patch_make(text1, diffs); + } + /** + * Compute a list of patches to turn text1 into text2. + * text1 will be derived from the provided diffs. + * @param diffs Array of diff tuples for text1 to text2. + * @return LinkedList of Patch objects. + */ + public LinkedList patch_make(LinkedList diffs) { + // No origin string provided, compute our own. + String text1 = diff_text1(diffs); + return patch_make(text1, diffs); + } + /** + * Compute a list of patches to turn text1 into text2. + * text2 is ignored, diffs are the delta between text1 and text2. + * @param text1 Old text + * @param text2 Ignored. + * @param diffs Array of diff tuples for text1 to text2. + * @return LinkedList of Patch objects. + * @deprecated Prefer patch_make(String text1, LinkedList diffs). + */ + public LinkedList patch_make(String text1, String text2, + LinkedList diffs) { + return patch_make(text1, diffs); + } + /** + * Compute a list of patches to turn text1 into text2. + * text2 is not provided, diffs are the delta between text1 and text2. + * @param text1 Old text. + * @param diffs Array of diff tuples for text1 to text2. + * @return LinkedList of Patch objects. + */ + public LinkedList patch_make(String text1, LinkedList diffs) { + LinkedList patches = new LinkedList(); + if (diffs.isEmpty()) { + return patches; // Get rid of the null case. + } + Patch patch = new Patch(); + int char_count1 = 0; // Number of characters into the text1 string. + int char_count2 = 0; // Number of characters into the text2 string. + // Start with text1 (prepatch_text) and apply the diffs until we arrive at + // text2 (postpatch_text). We recreate the patches one by one to determine + // context info. + String prepatch_text = text1; + String postpatch_text = text1; + for (Diff aDiff : diffs) { + if (patch.diffs.isEmpty() && aDiff.operation != Operation.EQUAL) { + // A new patch starts here. + patch.start1 = char_count1; + patch.start2 = char_count2; + } + switch (aDiff.operation) { + case INSERT: + patch.diffs.add(aDiff); + patch.length2 += aDiff.text.length(); + postpatch_text = postpatch_text.substring(0, char_count2) + + aDiff.text + postpatch_text.substring(char_count2); + break; + case DELETE: + patch.length1 += aDiff.text.length(); + patch.diffs.add(aDiff); + postpatch_text = postpatch_text.substring(0, char_count2) + + postpatch_text.substring(char_count2 + aDiff.text.length()); + break; + case EQUAL: + if (aDiff.text.length() <= 2 * Patch_Margin + && !patch.diffs.isEmpty() && aDiff != diffs.getLast()) { + // Small equality inside a patch. + patch.diffs.add(aDiff); + patch.length1 += aDiff.text.length(); + patch.length2 += aDiff.text.length(); + } + if (aDiff.text.length() >= 2 * Patch_Margin) { + // Time for a new patch. + if (!patch.diffs.isEmpty()) { + patch_addContext(patch, prepatch_text); + patches.add(patch); + patch = new Patch(); + // Unlike Unidiff, our patch lists have a rolling context. + // http://code.google.com/p/google-diff-match-patch/wiki/Unidiff + // Update prepatch text & pos to reflect the application of the + // just completed patch. + prepatch_text = postpatch_text; + char_count1 = char_count2; + } + } + break; + } + // Update the current character count. + if (aDiff.operation != Operation.INSERT) { + char_count1 += aDiff.text.length(); + } + if (aDiff.operation != Operation.DELETE) { + char_count2 += aDiff.text.length(); + } + } + // Pick up the leftover patch if not empty. + if (!patch.diffs.isEmpty()) { + patch_addContext(patch, prepatch_text); + patches.add(patch); + } + return patches; + } + /** + * Given an array of patches, return another array that is identical. + * @param patches Array of patch objects. + * @return Array of patch objects. + */ + public LinkedList patch_deepCopy(LinkedList patches) { + LinkedList patchesCopy = new LinkedList(); + for (Patch aPatch : patches) { + Patch patchCopy = new Patch(); + for (Diff aDiff : aPatch.diffs) { + Diff diffCopy = new Diff(aDiff.operation, aDiff.text); + patchCopy.diffs.add(diffCopy); + } + patchCopy.start1 = aPatch.start1; + patchCopy.start2 = aPatch.start2; + patchCopy.length1 = aPatch.length1; + patchCopy.length2 = aPatch.length2; + patchesCopy.add(patchCopy); + } + return patchesCopy; + } + /** + * Merge a set of patches onto the text. Return a patched text, as well + * as an array of true/false values indicating which patches were applied. + * @param patches Array of patch objects + * @param text Old text. + * @return Two element Object array, containing the new text and an array of + * boolean values. + */ + public Object[] patch_apply(LinkedList patches, String text) { + if (patches.isEmpty()) { + return new Object[]{text, new boolean[0]}; + } + // Deep copy the patches so that no changes are made to originals. + patches = patch_deepCopy(patches); + String nullPadding = patch_addPadding(patches); + text = nullPadding + text + nullPadding; + patch_splitMax(patches); + int x = 0; + // delta keeps track of the offset between the expected and actual location + // of the previous patch. If there are patches expected at positions 10 and + // 20, but the first patch was found at 12, delta is 2 and the second patch + // has an effective expected position of 22. + int delta = 0; + boolean[] results = new boolean[patches.size()]; + for (Patch aPatch : patches) { + int expected_loc = aPatch.start2 + delta; + String text1 = diff_text1(aPatch.diffs); + int start_loc; + int end_loc = -1; + if (text1.length() > this.Match_MaxBits) { + // patch_splitMax will only provide an oversized pattern in the case of + // a monster delete. + start_loc = match_main(text, + text1.substring(0, this.Match_MaxBits), expected_loc); + if (start_loc != -1) { + end_loc = match_main(text, + text1.substring(text1.length() - this.Match_MaxBits), + expected_loc + text1.length() - this.Match_MaxBits); + if (end_loc == -1 || start_loc >= end_loc) { + // Can't find valid trailing context. Drop this patch. + start_loc = -1; + } + } + } else { + start_loc = match_main(text, text1, expected_loc); + } + if (start_loc == -1) { + // No match found. :( + results[x] = false; + // Subtract the delta for this failed patch from subsequent patches. + delta -= aPatch.length2 - aPatch.length1; + } else { + // Found a match. :) + results[x] = true; + delta = start_loc - expected_loc; + String text2; + if (end_loc == -1) { + text2 = text.substring(start_loc, + Math.min(start_loc + text1.length(), text.length())); + } else { + text2 = text.substring(start_loc, + Math.min(end_loc + this.Match_MaxBits, text.length())); + } + if (text1.equals(text2)) { + // Perfect match, just shove the replacement text in. + text = text.substring(0, start_loc) + diff_text2(aPatch.diffs) + + text.substring(start_loc + text1.length()); + } else { + // Imperfect match. Run a diff to get a framework of equivalent + // indices. + LinkedList diffs = diff_main(text1, text2, false); + if (text1.length() > this.Match_MaxBits + && diff_levenshtein(diffs) / (float) text1.length() + > this.Patch_DeleteThreshold) { + // The end points match, but the content is unacceptably bad. + results[x] = false; + } else { + diff_cleanupSemanticLossless(diffs); + int index1 = 0; + for (Diff aDiff : aPatch.diffs) { + if (aDiff.operation != Operation.EQUAL) { + int index2 = diff_xIndex(diffs, index1); + if (aDiff.operation == Operation.INSERT) { + // Insertion + text = text.substring(0, start_loc + index2) + aDiff.text + + text.substring(start_loc + index2); + } else if (aDiff.operation == Operation.DELETE) { + // Deletion + text = text.substring(0, start_loc + index2) + + text.substring(start_loc + diff_xIndex(diffs, + index1 + aDiff.text.length())); + } + } + if (aDiff.operation != Operation.DELETE) { + index1 += aDiff.text.length(); + } + } + } + } + } + x++; + } + // Strip the padding off. + text = text.substring(nullPadding.length(), text.length() + - nullPadding.length()); + return new Object[]{text, results}; + } + /** + * Add some padding on text start and end so that edges can match something. + * Intended to be called only from within patch_apply. + * @param patches Array of patch objects. + * @return The padding string added to each side. + */ + public String patch_addPadding(LinkedList patches) { + int paddingLength = this.Patch_Margin; + String nullPadding = ""; + for (int x = 1; x <= paddingLength; x++) { + nullPadding += String.valueOf((char) x); + } + // Bump all the patches forward. + for (Patch aPatch : patches) { + aPatch.start1 += paddingLength; + aPatch.start2 += paddingLength; + } + // Add some padding on start of first diff. + Patch patch = patches.getFirst(); + LinkedList diffs = patch.diffs; + if (diffs.isEmpty() || diffs.getFirst().operation != Operation.EQUAL) { + // Add nullPadding equality. + diffs.addFirst(new Diff(Operation.EQUAL, nullPadding)); + patch.start1 -= paddingLength; // Should be 0. + patch.start2 -= paddingLength; // Should be 0. + patch.length1 += paddingLength; + patch.length2 += paddingLength; + } else if (paddingLength > diffs.getFirst().text.length()) { + // Grow first equality. + Diff firstDiff = diffs.getFirst(); + int extraLength = paddingLength - firstDiff.text.length(); + firstDiff.text = nullPadding.substring(firstDiff.text.length()) + + firstDiff.text; + patch.start1 -= extraLength; + patch.start2 -= extraLength; + patch.length1 += extraLength; + patch.length2 += extraLength; + } + // Add some padding on end of last diff. + patch = patches.getLast(); + diffs = patch.diffs; + if (diffs.isEmpty() || diffs.getLast().operation != Operation.EQUAL) { + // Add nullPadding equality. + diffs.addLast(new Diff(Operation.EQUAL, nullPadding)); + patch.length1 += paddingLength; + patch.length2 += paddingLength; + } else if (paddingLength > diffs.getLast().text.length()) { + // Grow last equality. + Diff lastDiff = diffs.getLast(); + int extraLength = paddingLength - lastDiff.text.length(); + lastDiff.text += nullPadding.substring(0, extraLength); + patch.length1 += extraLength; + patch.length2 += extraLength; + } + return nullPadding; + } + /** + * Look through the patches and break up any which are longer than the + * maximum limit of the match algorithm. + * @param patches LinkedList of Patch objects. + */ + public void patch_splitMax(LinkedList patches) { + int patch_size; + String precontext, postcontext; + Patch patch; + int start1, start2; + boolean empty; + Operation diff_type; + String diff_text; + ListIterator pointer = patches.listIterator(); + Patch bigpatch = pointer.hasNext() ? pointer.next() : null; + while (bigpatch != null) { + if (bigpatch.length1 <= Match_MaxBits) { + bigpatch = pointer.hasNext() ? pointer.next() : null; + continue; + } + // Remove the big old patch. + pointer.remove(); + patch_size = Match_MaxBits; + start1 = bigpatch.start1; + start2 = bigpatch.start2; + precontext = ""; + while (!bigpatch.diffs.isEmpty()) { + // Create one of several smaller patches. + patch = new Patch(); + empty = true; + patch.start1 = start1 - precontext.length(); + patch.start2 = start2 - precontext.length(); + if (precontext.length() != 0) { + patch.length1 = patch.length2 = precontext.length(); + patch.diffs.add(new Diff(Operation.EQUAL, precontext)); + } + while (!bigpatch.diffs.isEmpty() + && patch.length1 < patch_size - Patch_Margin) { + diff_type = bigpatch.diffs.getFirst().operation; + diff_text = bigpatch.diffs.getFirst().text; + if (diff_type == Operation.INSERT) { + // Insertions are harmless. + patch.length2 += diff_text.length(); + start2 += diff_text.length(); + patch.diffs.addLast(bigpatch.diffs.removeFirst()); + empty = false; + } else if (diff_type == Operation.DELETE && patch.diffs.size() == 1 + && patch.diffs.getFirst().operation == Operation.EQUAL + && diff_text.length() > 2 * patch_size) { + // This is a large deletion. Let it pass in one chunk. + patch.length1 += diff_text.length(); + start1 += diff_text.length(); + empty = false; + patch.diffs.add(new Diff(diff_type, diff_text)); + bigpatch.diffs.removeFirst(); + } else { + // Deletion or equality. Only take as much as we can stomach. + diff_text = diff_text.substring(0, Math.min(diff_text.length(), + patch_size - patch.length1 - Patch_Margin)); + patch.length1 += diff_text.length(); + start1 += diff_text.length(); + if (diff_type == Operation.EQUAL) { + patch.length2 += diff_text.length(); + start2 += diff_text.length(); + } else { + empty = false; + } + patch.diffs.add(new Diff(diff_type, diff_text)); + if (diff_text.equals(bigpatch.diffs.getFirst().text)) { + bigpatch.diffs.removeFirst(); + } else { + bigpatch.diffs.getFirst().text = bigpatch.diffs.getFirst().text + .substring(diff_text.length()); + } + } + } + // Compute the head context for the next patch. + precontext = diff_text2(patch.diffs); + precontext = precontext.substring(Math.max(0, precontext.length() + - Patch_Margin)); + // Append the end context for this patch. + if (diff_text1(bigpatch.diffs).length() > Patch_Margin) { + postcontext = diff_text1(bigpatch.diffs).substring(0, Patch_Margin); + } else { + postcontext = diff_text1(bigpatch.diffs); + } + if (postcontext.length() != 0) { + patch.length1 += postcontext.length(); + patch.length2 += postcontext.length(); + if (!patch.diffs.isEmpty() + && patch.diffs.getLast().operation == Operation.EQUAL) { + patch.diffs.getLast().text += postcontext; + } else { + patch.diffs.add(new Diff(Operation.EQUAL, postcontext)); + } + } + if (!empty) { + pointer.add(patch); + } + } + bigpatch = pointer.hasNext() ? pointer.next() : null; + } + } + /** + * Take a list of patches and return a textual representation. + * @param patches List of Patch objects. + * @return Text representation of patches. + */ + public String patch_toText(List patches) { + StringBuilder text = new StringBuilder(); + for (Patch aPatch : patches) { + text.append(aPatch); + } + return text.toString(); + } + /** + * Parse a textual representation of patches and return a List of Patch + * objects. + * @param textline Text representation of patches. + * @return List of Patch objects. + * @throws IllegalArgumentException If invalid input. + */ + public List patch_fromText(String textline) + throws IllegalArgumentException { + List patches = new LinkedList(); + if (textline.length() == 0) { + return patches; + } + List textList = Arrays.asList(textline.split("\n")); + LinkedList text = new LinkedList(textList); + Patch patch; + Pattern patchHeader + = Pattern.compile("^@@ -(\\d+),?(\\d*) \\+(\\d+),?(\\d*) @@$"); + Matcher m; + char sign; + String line; + while (!text.isEmpty()) { + m = patchHeader.matcher(text.getFirst()); + if (!m.matches()) { + throw new IllegalArgumentException( + "Invalid patch string: " + text.getFirst()); + } + patch = new Patch(); + patches.add(patch); + patch.start1 = Integer.parseInt(m.group(1)); + if (m.group(2).length() == 0) { + patch.start1--; + patch.length1 = 1; + } else if ("0".equals(m.group(2))) { + patch.length1 = 0; + } else { + patch.start1--; + patch.length1 = Integer.parseInt(m.group(2)); + } + patch.start2 = Integer.parseInt(m.group(3)); + if (m.group(4).length() == 0) { + patch.start2--; + patch.length2 = 1; + } else if ("0".equals(m.group(4))) { + patch.length2 = 0; + } else { + patch.start2--; + patch.length2 = Integer.parseInt(m.group(4)); + } + text.removeFirst(); + + while (!text.isEmpty()) { + try { + sign = text.getFirst().charAt(0); + } catch (IndexOutOfBoundsException e) { + // Blank line? Whatever. + text.removeFirst(); + continue; + } + line = text.getFirst().substring(1); + line = line.replace("+", "%2B"); // decode would change all "+" to " " + try { + line = URLDecoder.decode(line, "UTF-8"); + } catch (UnsupportedEncodingException e) { + // Not likely on modern system. + throw new Error("This system does not support UTF-8.", e); + } catch (IllegalArgumentException e) { + // Malformed URI sequence. + throw new IllegalArgumentException( + "Illegal escape in patch_fromText: " + line, e); + } + if (sign == '-') { + // Deletion. + patch.diffs.add(new Diff(Operation.DELETE, line)); + } else if (sign == '+') { + // Insertion. + patch.diffs.add(new Diff(Operation.INSERT, line)); + } else if (sign == ' ') { + // Minor equality. + patch.diffs.add(new Diff(Operation.EQUAL, line)); + } else if (sign == '@') { + // Start of next patch. + break; + } else { + // WTF? + throw new IllegalArgumentException( + "Invalid patch mode '" + sign + "' in: " + line); + } + text.removeFirst(); + } + } + return patches; + } + + + /** + * Class representing one diff operation. + */ + public static class Diff { + /** + * One of: INSERT, DELETE or EQUAL. + */ + public Operation operation; + /** + * The text associated with this diff operation. + */ + public String text; + + /** + * Constructor. Initializes the diff with the provided values. + * @param operation One of INSERT, DELETE or EQUAL. + * @param text The text being applied. + */ + public Diff(Operation operation, String text) { + // Construct a diff with the specified operation and text. + this.operation = operation; + this.text = text; + } + + + /** + * Display a human-readable version of this Diff. + * @return text version. + */ + @Override + public String toString() { + String prettyText = this.text.replace('\n', '\u00b6'); + return "Diff(" + this.operation + ",\"" + prettyText + "\")"; + } + + + /** + * Is this Diff equivalent to another Diff? + * @param d Another Diff to compare against. + * @return true or false. + */ + @Override + public boolean equals(Object d) { + try { + return (((Diff) d).operation == this.operation) + && (((Diff) d).text.equals(this.text)); + } catch (ClassCastException e) { + return false; + } + } + } + + + /** + * Class representing one patch operation. + */ + public static class Patch { + public LinkedList diffs; + public int start1; + public int start2; + public int length1; + public int length2; + + + /** + * Constructor. Initializes with an empty list of diffs. + */ + public Patch() { + this.diffs = new LinkedList(); + } + + + /** + * Emmulate GNU diff's format. + * Header: @@ -382,8 +481,9 @@ + * Indicies are printed as 1-based, not 0-based. + * @return The GNU diff string. + */ + @Override + public String toString() { + String coords1, coords2; + if (this.length1 == 0) { + coords1 = this.start1 + ",0"; + } else if (this.length1 == 1) { + coords1 = Integer.toString(this.start1 + 1); + } else { + coords1 = (this.start1 + 1) + "," + this.length1; + } + if (this.length2 == 0) { + coords2 = this.start2 + ",0"; + } else if (this.length2 == 1) { + coords2 = Integer.toString(this.start2 + 1); + } else { + coords2 = (this.start2 + 1) + "," + this.length2; + } + StringBuilder text = new StringBuilder(); + text.append("@@ -").append(coords1).append(" +").append(coords2) + .append(" @@\n"); + // Escape the body of the patch with %xx notation. + for (Diff aDiff : this.diffs) { + switch (aDiff.operation) { + case INSERT: + text.append('+'); + break; + case DELETE: + text.append('-'); + break; + case EQUAL: + text.append(' '); + break; + } + try { + text.append(URLEncoder.encode(aDiff.text, "UTF-8").replace('+', ' ')) + .append("\n"); + } catch (UnsupportedEncodingException e) { + // Not likely on modern system. + throw new Error("This system does not support UTF-8.", e); + } + } + return unescapeForEncodeUriCompatability(text.toString()); + } + } + + + /** + * Unescape selected chars for compatability with JavaScript's encodeURI. + * In speed critical applications this could be dropped since the + * receiving application will certainly decode these fine. + * Note that this function is case-sensitive. Thus "%3f" would not be + * unescaped. But this is ok because it is only called with the output of + * URLEncoder.encode which returns uppercase hex. + * + * Example: "%3F" -> "?", "%24" -> "$", etc. + * + * @param str The string to escape. + * @return The escaped string. + */ + private static String unescapeForEncodeUriCompatability(String str) { + return str.replace("%21", "!").replace("%7E", "~") + .replace("%27", "'").replace("%28", "(").replace("%29", ")") + .replace("%3B", ";").replace("%2F", "/").replace("%3F", "?") + .replace("%3A", ":").replace("%40", "@").replace("%26", "&") + .replace("%3D", "=").replace("%2B", "+").replace("%24", "$") + .replace("%2C", ",").replace("%23", "#"); + } + + public String getHtmlDiffString(String text1,String text2){ + return diff_prettyHtml(diff_main(text1,text2)); + } + + public static void main(String[] args){ + DiffMatchPatch dmp = new DiffMatchPatch(); + String text1 = "我方在“福市财政资金补助项目管理系统”的项目实施过程，为保证该项目的工程进度、质量，符合数办项目的实施管理规范与要求。"; + String text2 = "我方在“福州市财政资金补助项目管理系统”的项目实施过程，为保证该haha项目的工程进度、质量，符合目的实施管理规范与要求。"; + System.out.println(dmp.getHtmlDiffString(text1,text2)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/EventUtils/EventEditHistoryHighLightUtil.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/EventUtils/EventEditHistoryHighLightUtil.java new file mode 100644 index 00000000..e8058b57 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/EventUtils/EventEditHistoryHighLightUtil.java @@ -0,0 +1,209 @@ +package com.adc.da.slrs.standardSplit.EventUtils; + +/** + * @Description: TODO + * @author: super_liu + * @date: 2021年11月28日 12:28 + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; + +/** + * 文本差异高亮算法 + * + * @Author : cron + * @Date: 2020-01-15 + */ +@SuppressWarnings("all") +public class EventEditHistoryHighLightUtil { + + /** + * 传入2个字符串进行相比高亮显示 + * eg: + * 原数据一:王五张三 + * 原数据二:张三李四 + * 王五张三 + * 张三李四 + */ + + public static String[] getHighLightDifferentOld(String a, String b) { + String[] temp = getDiff(a, b); + String[] result = {getHighLight(a, temp[0]), getHighLight(b, temp[1])}; + return result; + } + + private static String getHighLight(String source, String temp) { + StringBuffer sb = new StringBuffer(); + char[] sourceChars = source.toCharArray(); + char[] tempChars = temp.toCharArray(); + boolean flag = false; + for (int i = 0; i < sourceChars.length; i++) { + if (tempChars[i] != ' ') { + if (i == 0) { + sb.append("").append(sourceChars[i]); + } else if (flag) { + sb.append(sourceChars[i]); + } else { + sb.append("").append(sourceChars[i]); + } + flag = true; + if (i == sourceChars.length - 1) { + sb.append(""); + } + } else if (flag) { + sb.append("").append(sourceChars[i]); + flag = false; + } else { + sb.append(sourceChars[i]); + } + } + return sb.toString(); + } + + public static String[] getDiff(String a, String b) { + String[] result = null; + //选取长度较小的字符串用来穷举子串 + if (a.length() < b.length()) { + result = getDiff(a, b, 0, a.length()); + } else { + result = getDiff(b, a, 0, b.length()); + result = new String[]{result[1], result[0]}; + } + return result; + } + + /** + * 将a的指定部分与b进行比较生成比对结果 + */ + private static String[] getDiff(String a, String b, int start, int end) { + String[] result = new String[]{a, b}; + int len = result[0].length(); + while (len > 0) { + for (int i = start; i < end - len + 1; i++) { + String sub = result[0].substring(i, i + len); + int idx = -1; + if ((idx = result[1].indexOf(sub)) != -1) { + result[0] = setEmpty(result[0], i, i + len); + result[1] = setEmpty(result[1], idx, idx + len); + if (i > 0) { + //递归获取空白区域左边差异 + result = getDiff(result[0], result[1], 0, i); + } + if (i + len < end) { + //递归获取空白区域右边差异 + result = getDiff(result[0], result[1], i + len, end); + } + len = 0;//退出while循环 + break; + } + } + len = len / 2; + } + return result; + } + + /** + * 将字符串s指定的区域设置成空格 + */ + public static String setEmpty(String s, int start, int end) { + char[] array = s.toCharArray(); + for (int i = start; i < end; i++) { + array[i] = ' '; + } + return new String(array); + } + + //--------------new ------------------------- + + public static String[] getHighLightDifferent(String altbe, String altaf) { + //字符串1 altbe 字符串2 altaf + List beList = rememberSpacing(altbe); + List afList = rememberSpacing(altaf); + altbe = altbe.replace(" ", ""); + altaf = altaf.replace(" ", ""); + LinkedList t = new DiffMatchPatch().diff_main(altbe, altaf); + StringBuffer s1 = new StringBuffer(); + StringBuffer s2 = new StringBuffer(); + Integer indexBe = 0; + Integer indexAf = 0; + for (DiffMatchPatch.Diff diff : t) { + StringBuffer diffTextBe = new StringBuffer(diff.text); + StringBuffer diffTextAf = new StringBuffer(diff.text); + if ("EQUAL".equalsIgnoreCase(diff.operation.toString())) { + addSpacing(beList, indexBe, diffTextBe); + addSpacing(afList, indexAf, diffTextAf); + s1.append(diffTextBe); + s2.append(diffTextAf); + indexBe += diffTextBe.length(); + indexAf += diffTextAf.length(); + } + indexBe = appendString2("DELETE", diff, s1, s2, beList, indexBe); + indexAf = appendString2("INSERT", diff, s2, s1, afList, indexAf); + } + String[] result = new String[2]; + result[0] = s1.toString(); + result[1] = s2.toString(); + return result; + } + +// public static void appendString(String type, Diff diff, StringBuffer sbOne, StringBuffer sbTwo) { +// if (type.equals(diff.operation.toString())) { +// if (" ".equals(diff.text)) { +// sbOne.append(" "); +// sbTwo.append(" "); +// } else { +// sbOne.append("").append(diff.text).append(""); +// } +// } +// } + + private static List rememberSpacing(String str) { + List list = new ArrayList<>(); + for (int i = 0; i < str.length(); i++) { + if (' ' == str.charAt(i)) { + list.add(i); + } + } + return list; + } + + public static void addSpacing(List list, Integer index, StringBuffer str) { + for (Integer o : list) { + if (o >= index && o < index + str.length()) { + str.insert(o - index, ' '); + } + } + } + + public static Integer appendString2(String type, DiffMatchPatch.Diff diff, StringBuffer sbOne, + StringBuffer sbTwo, List list, Integer i) { + Integer result = i; + if (type.equals(diff.operation.toString())) { + StringBuffer sb = new StringBuffer(diff.text); + for (Integer o : list) { + if (o >= i && o < i + sb.length()) { + sb.insert(o - i, ' '); + } + } + sbOne.append("").append(sb).append(""); + result = i + sb.length(); + } + return result; + } + + public static void main(String[] args) { + String a = "测试测试测试仅关注界面和功能，数据准确性在暂不测试"; + String b = "提交留言数据仅关注界面和功能，数据准确性在暂不测试"; + String[] anb = getHighLightDifferent(a, b); + System.out.println(Arrays.toString(anb)); + +// String altbe = "提交留言数据仅关注界面和 功能，数据准确性在暂不测试"; +// String altaf = "提交留言数据仅关注界面和功能，数据准确性在暂不测试提交 留言数据仅关注界面和功能，数据准确性在暂不测试"; +// String[] highLightDifferentNew = getHighLightDifferent(altbe, altaf); +// System.out.println(Arrays.toString(highLightDifferentNew)); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 98287330..112b4ca0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -190,7 +190,7 @@ public class SarFileSplitItemsEOController extends BaseController> clauseComparison(String oldItemId, String newItemId, String standHisId) throws Exception { - Map resultMap = sarStandCompareHisEOService.clauseComparison(oldItemId,newItemId,standHisId); + public ResponseMessage> clauseComparison(String oldItemId, String newItemId, String standHisId,String flag) throws Exception { + Map resultMap = sarStandCompareHisEOService.clauseComparisonEvent(oldItemId,newItemId,standHisId,flag); return Result.success(resultMap); } @ApiOperation(value = "全文比对") @PostMapping("/fullTextComparison") - public ResponseMessage> fullTextComparison(String leftStandard, String rightStandard) throws Exception { - Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard); - return Result.success(resultMap); + public ResponseMessage fullTextComparison(String leftStandard, String rightStandard) throws Exception { + SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.selectByPrimaryKey(leftStandard); + SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.selectByPrimaryKey(rightStandard); + //保存标准比对历史表数据 + SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO(); +// String id = UUIDUtils.randomUUID20(); + String id=UUIDUtils.randomUUID(32); + sarStandCompareHisEO.setId(id); + sarStandCompareHisEO.setOldStandId(leftStandard); + sarStandCompareHisEO.setNewStandId(rightStandard); + sarStandCompareHisEO.setOldFileType(leftInfo.getFileType()); + sarStandCompareHisEO.setNewFileType(rightInfo.getFileType()); + sarStandCompareHisEO.setOldStandName(leftInfo.getStandNameSplit()); + sarStandCompareHisEO.setNewStandName(rightInfo.getStandNameSplit()); + sarStandCompareHisEO.setOldStandNum(leftInfo.getStandNumSplit()); + sarStandCompareHisEO.setNewStandNum(rightInfo.getStandNumSplit()); + sarStandCompareHisEO.setOldSarType(leftInfo.getSarType()); + sarStandCompareHisEO.setNewSarType(rightInfo.getSarType()); + sarStandCompareHisEO.setCreateTime(new Date()); + sarStandCompareHisEO.setModifyTime(new Date()); + sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); + sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); + sarStandCompareHisEO.setCompareStatus("比对中"); + sarStandCompareHisEO.setCompareType("全文比对"); + sarStandCompareHisEO.setCreateTime(new Date()); + dao.insertSelective(sarStandCompareHisEO); + Map resultMap = sarStandCompareHisEOService.fullTextComparison(leftStandard,rightStandard,id); + return Result.success("标准正在比对中请稍后查看结果"); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java index 7ab8d9ff..637f9fe0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java @@ -3,6 +3,10 @@ package com.adc.da.slrs.standardSplit.controller; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -119,6 +123,8 @@ public class SarStandFileEOController extends BaseController { page.setFileSuffixList(suffix.split(",")); } List rows = sarStandFileEOService.getStandFileListByPage(page); + Integer count = sarStandFileEOService.getStandFileListByPageCount(page); + page.getPager().setRowCount(count); for (SarStandFileEO one:rows) { one.setAttId(one.getAttId1()); } @@ -136,7 +142,7 @@ public class SarStandFileEOController extends BaseController { } - @ApiOperation(value = "查询文本信息") + @ApiOperation(value = "查询转换后文本信息") @GetMapping("/queryFileInfo") public ResponseMessage> queryFileInfo(String standId){ @@ -144,4 +150,21 @@ public class SarStandFileEOController extends BaseController { return Result.success(sarStandFileEOS); } + @ApiOperation(value = "查询文本信息") + @GetMapping("/queryFileInfoNew") + public ResponseMessage> queryFileInfoNew(@RequestParam("standId") String standId,@RequestParam("type") String type) throws Exception { + + List sarStandFileEOS = sarStandFileEOService.selectFileByStandIdOCR(standId,type); + return Result.success(sarStandFileEOS); + } + + + + @ApiOperation(value = "查询转原始文件信息") + @GetMapping("/querySourceFileInfo") + public ResponseMessage> querySourceFileInfo(String standId){ + + List sarStandFileEOS = sarStandFileEOService.querySourceFileInfo(standId); + return Result.success(sarStandFileEOS); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java index 7bdbbe20..6e33be7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java @@ -32,6 +32,8 @@ public interface SarStandFileEODao extends BaseMapper { List getStandFileListByPage(SarStandFileEOPage stand); + Integer getStandFileListByPageCount(SarStandFileEOPage stand); + int queryStandFileListByCount(SarStandFileEOPage stand); List queryByPage(SarStandFileEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java index 8025b05a..5b075d27 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEO.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.util.ArrayList; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.List; * 日期： 2020-02-24
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarStandCompareHisEO extends BaseEntity { private String compareType; @@ -36,6 +38,7 @@ public class SarStandCompareHisEO extends BaseEntity { private String newFileTypeShow; private String newSarType; private String collectId; + private String compareStatus; private List resLeftMapList = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java index 3bf314dd..375a13ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandCompareHisEOPage.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：SAR_STAND_COMPARE_HIS SarStandCompareHisEOPage
    @@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2020-02-24
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarStandCompareHisEOPage extends BasePage { private String compareType; @@ -50,6 +52,7 @@ public class SarStandCompareHisEOPage extends BasePage { private String oldNumOrName; private String newNumOrName; + private String compareStatus; private String shunxu; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java index 02332e62..96d10cca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.entity; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：SAR_STAND_FILE SarStandFileEOPage
    @@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2018-09-03
    * 版权所有：版权归北京卡达克数据技术中心所有。
    */ +@Data public class SarStandFileEOPage extends BasePage { private String modifyTime; @@ -36,6 +38,7 @@ public class SarStandFileEOPage extends BasePage { private String standName; private String fileType; private String standFileClassify; + private int rowCount; public String getModifyTime() { return this.modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java index 1eb72339..1b4c8683 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandCompareHisEOService.java @@ -21,5 +21,7 @@ public interface SarStandCompareHisEOService { Map clauseComparison(String oldItemId, String newItemId, String standHisId); - Map fullTextComparison(String leftStandard, String rightStandard) throws Exception; + Map clauseComparisonEvent(String oldItemId, String newItemId, String standHisId,String flag); + + Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java index 4d876d41..7c6f42e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java @@ -9,6 +9,8 @@ public interface SarStandFileEOService { List getStandFileListByPage(SarStandFileEOPage stand); + Integer getStandFileListByPageCount(SarStandFileEOPage stand); + List queryByPage(SarStandFileEOPage page); List queryByList(SarStandFileEOPage page); @@ -23,6 +25,21 @@ public interface SarStandFileEOService { List selectFileByAttId(String attId) throws Exception; + /** + * 查询转换后文件的文本信息 + * @param standId + * @return + */ List selectFileByStandId(String standId); + List selectFileByStandIdOCR(String standId,String type) throws Exception; + + /** + * 查询转原始文件的信息 + * @param standId + * @return + */ + List querySourceFileInfo(String standId); + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d2f18ceb..b0f15bbd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -4,6 +4,8 @@ import com.adc.da.att.service.IAttFileEOService; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.dao.*; import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; import com.adc.da.att.entity.AttFileEO; @@ -52,6 +54,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService @Autowired private ISarStandAttrDetailsService sarStandAttrDetailsEOService; + @Autowired + private ISarStandardsInfoService sarStandardsInfoService; @Autowired private IAttFileEOService attFileEOService; @@ -122,8 +126,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService //用来往标准分解单里添加数据 List standList = new ArrayList<>(); - + SarStandardsInfo sarStandardsInfo=sarStandardsInfoService.getById(sarFileSplitInfoEO.getStandId()); // 拆分文件主表中插入数据 + sarFileSplitInfoEO.setStandName(sarStandardsInfo.getStandName()); + sarFileSplitInfoEO.setStandNameSplit(sarStandardsInfo.getStandName()); + sarFileSplitInfoEO.setStandNumSplit(sarStandardsInfo.getStandSort()+" "+sarStandardsInfo.getStandNumber()+"-"+sarStandardsInfo.getStandYear()); sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); sarFileSplitInfoEO.setValidFlag(0); sarFileSplitInfoEO.setCreationTime(new Date()); @@ -368,22 +375,23 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService sarFileSplitItemsValEODao.insertForeach(itemValList); - //用来往标准分解单插入数据 - messageList.forEach(item -> { - //new一个对象 - SarStandItems standItems1 = new SarStandItems(); - //standItems1里的这个值为messageList里的ItermsConditions - standItems1.setId(UUIDUtils.randomUUID20()) - .setFileType(sarFileSplitInfoEO.getFileType()) - .setStandId(sarFileSplitInfoEO.getStandId()) - .setItemsNum(item.getItemsNum()) - .setItemsName(item.getItemsName()) - .setTermsConditions(item.getItermsConditions()) - .setEditFlag(item.getEditFlag()); - - standList.add(standItems1); - }); - sarFileSplitItemsEODao.insertStandSplitForeach(standList); +// 2021/11/23改用标准详情手动插入 +// //用来往标准分解单插入数据 +// messageList.forEach(item -> { +// //new一个对象 +// SarStandItems standItems1 = new SarStandItems(); +// //standItems1里的这个值为messageList里的ItermsConditions +// standItems1.setId(UUIDUtils.randomUUID20()) +// .setFileType(sarFileSplitInfoEO.getFileType()) +// .setStandId(sarFileSplitInfoEO.getStandId()) +// .setItemsNum(item.getItemsNum()) +// .setItemsName(item.getItemsName()) +// .setTermsConditions(item.getItermsConditions()) +// .setEditFlag(item.getEditFlag()); +// +// standList.add(standItems1); +// }); +// sarFileSplitItemsEODao.insertStandSplitForeach(standList); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java index 5ec05134..19cf6cf5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsEOServiceImpl.java @@ -399,7 +399,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic String imgContent = itemsValEO.getItemContent(); String imgUUIndex = "img" + String.valueOf(imgIndex); if (StringUtils.isNotEmpty(imgContent)){ - int pathIndex = imgContent.indexOf("src='uploadPath"); + int pathIndex = imgContent.indexOf("src='file"); if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); @@ -525,7 +525,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); @@ -559,7 +559,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); @@ -595,7 +595,7 @@ public class SarFileSplitItemsEOServiceImpl implements SarFileSplitItemsEOServic AttFileVo attFileVo = attFileEOService.saveFileInfo(nowfilelist.get(0)); if(attFileVo!=null){ isText = false; - String path = "uploadPath" + attFileVo.getFilePath()+attFileVo.getFileName(); + String path = "file" + attFileVo.getFilePath()+attFileVo.getFileName(); String imgCon = ""; valEO.setType("IMG"); valEO.setItemContent(imgCon); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java index 5ead95c6..fec300f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -383,6 +383,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService sarFileSplitItemsEO.setModifyTime(new Date()); sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId()); sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId()); + sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID())); result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO); // SAR_FILE_ITEMS_VAL 添加数据， diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java index 1033d3be..937dd5e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.standardSplit.service.impl; import com.adc.da.person.service.IPersonCollectEOService; +import com.adc.da.slrs.standardSplit.EventUtils.EventEditHistoryHighLightUtil; import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao; import com.adc.da.slrs.standardSplit.dao.SarStandCompareHisEODao; import com.adc.da.slrs.standardSplit.entity.*; @@ -14,6 +15,7 @@ import com.adc.da.utils.treetool.TreeNode; import com.adc.da.utils.util.CompHanLPUtils; import com.adc.da.utils.util.DiffUtils; import org.apache.commons.lang.StringUtils; +import org.apache.poi.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -112,6 +114,138 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ return sarStandCompareHisEODao.deleteByPrimaryKey(id); } + @Override + public Map clauseComparisonEvent(String oldItemId, String newItemId, String standHisId, String flag) { + Map resultMap = new HashMap(); + String oldTxt = ""; + SarFileSplitItemsValEOPage oldPage = new SarFileSplitItemsValEOPage(); + oldPage.setItemId(oldItemId); + oldPage.setType("TEXT"); + oldPage.setOrderBy("DISPLAY_SEQ,ID"); + List oldList = sarFileSplitItemsValEOService.queryByList(oldPage); + if(oldList!=null && !oldList.isEmpty()){ + for(int i = 1;i<=oldList.size();i++){ + if(i==oldList.size()) { + oldTxt += oldList.get(i-1).getItemContent(); + }else{ + oldTxt += oldList.get(i-1).getItemContent() + "i#2\n"; + } + } + } + String newTxt = ""; + SarFileSplitItemsValEOPage newPage = new SarFileSplitItemsValEOPage(); + newPage.setItemId(newItemId); + newPage.setType("TEXT"); + newPage.setOrderBy("DISPLAY_SEQ,ID"); + List newList = sarFileSplitItemsValEOService.queryByList(newPage); + if(newList!=null && !newList.isEmpty()){ + for(int i = 1;i<=newList.size();i++){ + if(i==newList.size()) { + newTxt += newList.get(i-1).getItemContent(); + }else{ + newTxt += newList.get(i-1).getItemContent() + "i#2\n"; + } + } + } + String similarityDegree=""; + double similarity = 100.00; + if(!StringUtils.isNotBlank(oldTxt.trim()) && !StringUtils.isNotBlank(newTxt.trim())){ + similarityDegree = "100.00"; + }else if(StringUtils.isNotBlank(oldTxt.trim()) && StringUtils.isNotBlank(newTxt.trim())){ + similarity = CompHanLPUtils.findSimilarity(oldTxt.trim(), newTxt.trim()); + NumberFormat nf = java.text.NumberFormat.getPercentInstance(); + //nf.setMaximumIntegerDigits(2);//小数点前保留几位 + nf.setMinimumFractionDigits(2);// 小数点后保留几位 + similarityDegree = nf.format(similarity); + }else{ + similarity = 0.00; + similarityDegree = "0.00"; + } + resultMap.put("similarityDegree",similarityDegree); + List leftString = new ArrayList<>(); + List rightString = new ArrayList<>(); + if(similarity >= 0.6){ +// DiffUtils diffUtils = new DiffUtils(); +// List htmlDiffStr = diffUtils.getHtmlDiffStr(oldTxt.trim(), newTxt.trim()); +// List stringList1 = Arrays.asList(htmlDiffStr.get(0).split("
    ")); +// for(String left : stringList1){ +// StringBuilder stringBuilder = new StringBuilder(left); +// stringBuilder.append("
    "); +// leftString.add(stringBuilder.toString()); +// } +// List stringList2 = Arrays.asList(htmlDiffStr.get(1).split("
    ")); +// for(String right : stringList2){ +// StringBuilder stringBuilder = new StringBuilder(right); +// stringBuilder.append("
    "); +// rightString.add(stringBuilder.toString()); +// } + String[] anb = EventEditHistoryHighLightUtil.getHighLightDifferent(oldTxt.trim(), newTxt.trim()); + if(StringUtils.isNotBlank(flag) && flag.equals("2")){ + anb[0] = anb[0].replaceAll("red;", "#000000;background-color: red;").replaceAll("i#2\n", "
    "); + anb[1] = anb[1].replaceAll("red;", "#000000;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "
    "); + }else { + anb[0] = anb[0].replaceAll("red;", "#000000;background-color: rgb(51, 145, 206);").replaceAll("i#2\n", "
    "); + anb[1] = anb[1].replaceAll("red;", "#000000;background-color: red;").replaceAll("i#2\n", "
    "); + } + resultMap.put("leftString",anb[0]); + resultMap.put("rightString",anb[1]); + }else{ + String oldTxtTemp = oldTxt.replace("i#2\n", "
    "); + List stringList1 = Arrays.asList(oldTxtTemp.split("
    ")); + for(String left : stringList1){ + StringBuilder stringBuilder = new StringBuilder(left); + stringBuilder.append(""); + stringBuilder.insert(0,"
    "); + leftString.add(stringBuilder.toString()); + } + resultMap.put("leftString",leftString); + String newTxtTemp = newTxt.replace("i#2\n", "
    "); + List stringList2 = Arrays.asList(newTxtTemp.split("
    ")); + for(String right : stringList2){ + StringBuilder stringBuilder = new StringBuilder(right); + stringBuilder.append("
    "); + stringBuilder.insert(0,"
    "); + rightString.add(stringBuilder.toString()); + } + resultMap.put("rightString",rightString); + } + //往条款比对历史表中添加数据 + if(standHisId != null && !standHisId.isEmpty()){ + SarFileSplitItemsEO leftEo = sarFileSplitItemsEOService.selectByPrimaryKey(oldItemId); + SarFileSplitItemsEO rightEo = sarFileSplitItemsEOService.selectByPrimaryKey(newItemId); + String leftItemsText = ""; + if(leftString != null && !leftString.isEmpty()){ + for(String left : leftString){ + leftItemsText += left; + } + } + String rightItemsText = ""; + if(rightString != null && !rightString.isEmpty()){ + for(String right : rightString){ + rightItemsText += right; + } + } + SarItemsCompareHisEO sarItemsCompareHisEO = new SarItemsCompareHisEO(); + sarItemsCompareHisEO.setId(UUIDUtils.randomUUID20()); + sarItemsCompareHisEO.setOldItemsId(leftEo.getId()); + sarItemsCompareHisEO.setOldItemsName(leftEo.getItemsName()); + sarItemsCompareHisEO.setOldItemsNum(leftEo.getItemsNum()); + sarItemsCompareHisEO.setOldItemsText(leftItemsText); + sarItemsCompareHisEO.setNewItemsId(rightEo.getId()); + sarItemsCompareHisEO.setNewItemsName(rightEo.getItemsName()); + sarItemsCompareHisEO.setNewItemsNum(rightEo.getItemsNum()); + sarItemsCompareHisEO.setNewItemsText(rightItemsText); + sarItemsCompareHisEO.setStandHisId(standHisId); + sarItemsCompareHisEO.setSimilarityDegree(similarityDegree); + sarItemsCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); + sarItemsCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); + sarItemsCompareHisEO.setModifyTime(new Date()); + sarItemsCompareHisEO.setCreateTime(new Date()); + sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); + } + return resultMap; + } + @Override public Map clauseComparison(String oldItemId, String newItemId, String standHisId) { Map resultMap = new HashMap(); @@ -245,9 +379,9 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ } return resultMap; } - + @Async @Override - public Map fullTextComparison(String leftStandard, String rightStandard) throws Exception{ + public Map fullTextComparison(String leftStandard, String rightStandard,String id) throws Exception{ Map resultMap = new HashMap(); List> leftMapList = fullTextComparePackageData(leftStandard); List> rightMapList = fullTextComparePackageData(rightStandard); @@ -281,7 +415,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ resultMap.put("resRightMapList",resRightMapList); } //往全文比对历史表中添加数据 - addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList); + addStandCompareHis(leftStandard,rightStandard,"全文比对",resLeftMapList,resRightMapList,id); return resultMap; } @@ -319,29 +453,16 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ **/ @Async public void addStandCompareHis(String leftStandId,String rightStandId,String compareType, - List> resLeftMapList,List> resRightMapList) throws Exception{ + List> resLeftMapList,List> resRightMapList,String id) throws Exception{ SarFileSplitInfoEO leftInfo = sarFileSplitInfoEOService.selectByPrimaryKey(leftStandId); SarFileSplitInfoEO rightInfo = sarFileSplitInfoEOService.selectByPrimaryKey(rightStandId); //保存标准比对历史表数据 SarStandCompareHisEO sarStandCompareHisEO = new SarStandCompareHisEO(); - String id = UUIDUtils.randomUUID20(); +// String id = UUIDUtils.randomUUID20(); sarStandCompareHisEO.setId(id); - sarStandCompareHisEO.setOldStandId(leftStandId); - sarStandCompareHisEO.setNewStandId(rightStandId); - sarStandCompareHisEO.setOldFileType(leftInfo.getFileType()); - sarStandCompareHisEO.setNewFileType(rightInfo.getFileType()); - sarStandCompareHisEO.setOldStandName(leftInfo.getStandNameSplit()); - sarStandCompareHisEO.setNewStandName(rightInfo.getStandNameSplit()); - sarStandCompareHisEO.setOldStandNum(leftInfo.getStandNumSplit()); - sarStandCompareHisEO.setNewStandNum(rightInfo.getStandNumSplit()); - sarStandCompareHisEO.setOldSarType(leftInfo.getSarType()); - sarStandCompareHisEO.setNewSarType(rightInfo.getSarType()); - sarStandCompareHisEO.setCreateTime(new Date()); - sarStandCompareHisEO.setModifyTime(new Date()); - sarStandCompareHisEO.setCreateUser(LoginUserUtil.getUserId()); - sarStandCompareHisEO.setModifyUser(LoginUserUtil.getUserId()); sarStandCompareHisEO.setCompareType(compareType); - dao.insertSelective(sarStandCompareHisEO); + sarStandCompareHisEO.setCompareStatus("比对完成"); + dao.updateByPrimaryKeySelective(sarStandCompareHisEO); //保存标准的所有条款比对的历史数据 if(resLeftMapList!=null && !resLeftMapList.isEmpty()) { setStandCompareHisEO(resLeftMapList, id, "LEFT"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java index 4e6217d5..cac6a18f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java @@ -1,6 +1,9 @@ package com.adc.da.slrs.standardSplit.service.impl; -import com.adc.da.slrs.standardSplit.dao.SarStandAttrDetailsEODao; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.standardSplit.dao.SarStandFileEODao; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; @@ -12,23 +15,33 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Map; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarStandFileEOServiceImpl implements SarStandFileEOService { - private static final Logger logger = LoggerFactory.getLogger(SarStandFileEOServiceImpl.class); @Autowired private SarStandFileEODao sarStandFileEODao; @Autowired - private SarStandAttrDetailsEODao sarStandAttrDetailsEODao; + private ISarStandardsInfoService sarStandardsInfoEOService; + @Autowired + private ISarBussionessStandService sarBussionessStandEOService; + @Override public List getStandFileListByPage(SarStandFileEOPage stand){ return sarStandFileEODao.getStandFileListByPage(stand); } + @Override + public Integer getStandFileListByPageCount(SarStandFileEOPage stand){ + return sarStandFileEODao.getStandFileListByPageCount(stand); + } + @Override public List queryByPage(SarStandFileEOPage page){ return sarStandFileEODao.queryByPage(page); @@ -70,18 +83,82 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService { queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","WEB_FILE"); List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); - + /** + * 询转换后文件信息 因为文件转换成pdf后会出现文件名位路径的情况,遍历查询文件的原始文件信息从中取出正确的文件名 + */ + //开耀这地方我把selectOne改成了批量因为 查单个数据里面出了问题你看看给改一下 sarStandFileEOS.forEach(item->{ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("ORI_ATT_ID",item.getOriAttId()) - .eq("USE_MODEL","SOURCE_FILE"); - SarStandFileEO sarStandFileEO = sarStandFileEODao.selectOne(wrapper); - item.setFileOldName(sarStandFileEO.getFileName()); + .eq("USE_MODEL","SOURCE_FILE").orderByDesc("CREATION_TIME"); + List sarStandFileEO = sarStandFileEODao.selectList(wrapper); + item.setFileOldName(sarStandFileEO.get(0).getFileOldName()); }); return sarStandFileEOS; + } + //type == 0 是pdf type==1 是doc + @Override + public List selectFileByStandIdOCR(String standId , String type) throws Exception { + QueryWrapper queryWrapper= new QueryWrapper<>(); + List choose=new ArrayList<>(); + SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(standId); + SarBussionessStand result2 = sarBussionessStandEOService.selectStandardsInfoUpdateByKey(standId); + if (null!=result.getAttrInfoCaseMap()){ + Map map=result.getAttrInfoCaseMap(); + for (String key:result.getAttrInfoCaseMap().keySet()) { + if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){ + if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){ + choose.addAll(new ArrayList<>(Arrays.asList(result.getAttrInfoCaseMap().get(key).toString().split(",")))); + }else { + choose.add(result.getAttrInfoCaseMap().get(key).toString()); + } + } + } + } + if (null!=result2){ -// return sarStandFileEODao.selectFileByStandId(standId);r + } + + queryWrapper.eq("STAND_ID",standId); + if ("0".equals(type)){ + queryWrapper.eq("USE_MODEL", "WEB_FILE"); + }else { + queryWrapper.eq("USE_MODEL", "SOURCE_FILE"); + } + queryWrapper.in("ATT_ID",choose); + List sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); + + if ("0".equals(type)){ + List remove=new ArrayList<>(); + sarStandFileEOS.forEach(sarStandFileEO -> { + if (!sarStandFileEO.getFileName().contains(".PDF") && !sarStandFileEO.getFileName().contains(".pdf") ){ + remove.add(sarStandFileEO); + } + }); + sarStandFileEOS.removeAll(remove); + }else { + List remove=new ArrayList<>(); + sarStandFileEOS.forEach(sarStandFileEO -> { + if (!sarStandFileEO.getFileName().contains(".DOC") && !sarStandFileEO.getFileName().contains(".doc") && + !sarStandFileEO.getFileName().contains(".DOCX") && !sarStandFileEO.getFileName().contains(".docx")){ + remove.add(sarStandFileEO); + } + }); + sarStandFileEOS.removeAll(remove); + } + return sarStandFileEOS; } + + @Override + public List querySourceFileInfo(String standId){ + QueryWrapper queryWrapper= new QueryWrapper<>(); + + queryWrapper.eq("STAND_ID",standId).eq("USE_MODEL","SOURCE_FILE"); + return sarStandFileEODao.selectList(queryWrapper); + + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java index 0566b276..60644bd3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java @@ -58,5 +58,12 @@ public class WgDept extends BaseEntity { @TableField("join_id") private String joinId; + @ApiModelProperty(value = "手机号") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮箱") + @TableField("email") + private String email; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java index db6423e3..5711d5a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDeptShow.java @@ -54,11 +54,11 @@ public class WgDeptShow extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java index 12b1edec..6ec1cf93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -44,5 +44,14 @@ public class WgNetInfo extends BaseEntity { @TableField("join_id") private String joinId; + @ApiModelProperty(value = "手机号") + @TableField("phone") + private String phone; + + @ApiModelProperty(value = "邮箱") + @TableField("email") + private String email; + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java index cdf47254..2b2e48a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfoDTO.java @@ -48,11 +48,11 @@ public class WgNetInfoDTO extends BaseEntity { @ApiModelProperty(value = "中文名") private String name; - @ApiModelProperty(value = "单位") + @ApiModelProperty(value = "单位名称") private String unit; - @ApiModelProperty(value = "单位名称") - private String unitName; + @ApiModelProperty(value = "单位") + private String unitId; @ApiModelProperty(value = "电话") private String phone; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java index 01a25d53..4deca5fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java @@ -40,7 +40,7 @@ public class WgPayInfo extends BaseEntity { @ApiModelProperty(value = "价格") @TableField("price") - private BigDecimal price; + private String price; @ApiModelProperty(value = "年份") @TableField("year") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java index 5e736116..7dd662bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java @@ -74,18 +74,26 @@ public class WgWorkGroupShowDTO extends BaseEntity { //支付信息 List wgPayInfos; + private String wgPayInfosDel; + //标准政策 List wgStandorpolicyInfos; //集团参与情况 List wgDepts; + private String wgDeptsDel; + //秘书联系方式 List wgNetInfos; + private String wgNetInfosDel; + //参会记录及资料 List wgMeetingInfos; + private String wgMeetingInfosDel; + List children; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java index 04e3946f..2525d233 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -23,7 +23,9 @@ import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -329,19 +331,34 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgDeptsDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgDeptsDel().split(","))); + wgDeptService.removeByIds(strings); + } List wgDepts=new ArrayList<>(); wgWorkGroupShowDTO.getWgDepts().forEach(wgDeptShow -> { WgDept wgDept=new WgDept(); BeanUtils.copyProperties(wgDeptShow,wgDept); + if (null==wgDept.getWgId()){ + wgDept.setWgId(wgWorkGroupShowDTO.getId()); + } wgDepts.add(wgDept); }); - flag = wgDeptService.saveOrUpdateBatch(wgDepts); } if (null != wgWorkGroupShowDTO.getWgMeetingInfos() && wgWorkGroupShowDTO.getWgMeetingInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgMeetingInfosDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgMeetingInfosDel().split(","))); + wgDeptService.removeByIds(strings); + wgMeetingUserRelationService.removeByIds(strings); + } List removeMeet = new ArrayList<>(); List wgMeetingUserRelations = new ArrayList<>(); wgWorkGroupShowDTO.getWgMeetingInfos().forEach(wgMeetingInfo -> { + if (null==wgMeetingInfo.getId()){ + wgMeetingInfo.setId(String.valueOf(UUID.randomUUID())); + wgMeetingInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgMeetingInfo.getMeetingPeople().forEach(s -> { WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation(); wgMeetingUserRelation.setUserId(s); @@ -350,27 +367,50 @@ public class WgWorkGroupServiceImpl extends ServiceImpl 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgNetInfosDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgNetInfosDel().split(","))); + wgNetInfoService.removeByIds(strings); + } List wgNetInfos = new ArrayList<>(); wgWorkGroupShowDTO.getWgNetInfos().forEach(wgNetInfoDTO -> { WgNetInfo wgNetInfo = new WgNetInfo(); BeanUtils.copyProperties(wgNetInfoDTO, wgNetInfo); + if (null==wgNetInfo.getWgId()){ + wgNetInfo.setWgId(wgWorkGroupShowDTO.getId()); + } wgNetInfos.add(wgNetInfo); }); flag = wgNetInfoService.saveOrUpdateBatch(wgNetInfos); } if (null != wgWorkGroupShowDTO.getWgPayInfos() && wgWorkGroupShowDTO.getWgPayInfos().size() > 0) { + if (StringUtils.isNotEmpty(wgWorkGroupShowDTO.getWgPayInfosDel())){ + List strings=new ArrayList<>(Arrays.asList(wgWorkGroupShowDTO.getWgPayInfosDel().split(","))); + wgPayInfoService.removeByIds(strings); + } + if (!wgWorkGroupShowDTO.getWgPayInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgPayInfos().forEach(wgPayInfo -> { + if (null==wgPayInfo.getWgId()){ + wgPayInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); } if (null != wgWorkGroupShowDTO.getWgStandorpolicyInfos() && wgWorkGroupShowDTO.getWgStandorpolicyInfos().size() > 0) { + if (!wgWorkGroupShowDTO.getWgStandorpolicyInfos().isEmpty()){ + wgWorkGroupShowDTO.getWgStandorpolicyInfos().forEach(wgStandorpolicyInfo -> { + if (null==wgStandorpolicyInfo.getWgId()){ + wgStandorpolicyInfo.setWgId(wgWorkGroupShowDTO.getId()); + } + }); + } flag = wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java index 49cbfd3d..f3f714ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -15,13 +15,13 @@ import com.adc.da.base.web.BaseController; import java.util.List; /** -*

    - * 标准制修订补助资金收支统计支出表 前端控制器 - *

    -* -* @author super_liu -* @since 2021-11-12 -*/ + *

    + * 标准制修订补助资金收支统计支出表 前端控制器 + *

    + * + * @author super_liu + * @since 2021-11-12 + */ @RestController @Api(description = "|WgdZcb|") @RequestMapping("api/wgdCensusLeo/wgd-zcb") @@ -30,13 +30,14 @@ public class WgdZcbController extends BaseController { IWgdZcbService iWgdZcbService; @GetMapping("/getAllZcbs") - public ResponseMessage getAllWgdZcbs(){//查询所有 + public ResponseMessage getAllWgdZcbs() {//查询所有 return Result.success(iWgdZcbService.getAllWgdZcbs()); } + @ApiOperation("查询") @GetMapping("/queryAllZcbs") - public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 + public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb) {//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); return Result.success(pageInfo); @@ -60,13 +61,13 @@ public class WgdZcbController extends BaseController { } @PostMapping("/delZcb") - ResponseMessage deleteWgdZcb(String id){//删除 + ResponseMessage deleteWgdZcb(String id) {//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } @ApiOperation("删除") @PostMapping("/delZcbs") - ResponseMessage deleteWgdZcbs(String ids){//批量删除 + ResponseMessage deleteWgdZcbs(String ids) {//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java index a47c4c65..0ee8a508 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -35,10 +35,9 @@ public class WgdZcb extends BasePage { private String cost; @ApiModelProperty(value = "用途") - private String use; + private String purposes; @ApiModelProperty(value = "详细附件") - private String annex; - + private String annexs; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 921f9896..b21525e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -2,6 +2,7 @@ package com.adc.da.utils.util; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import java.io.BufferedReader; @@ -11,7 +12,10 @@ import java.sql.Clob; import java.sql.SQLException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * @Description: 处理各类型字段 @@ -99,11 +103,17 @@ public class FieldConvertUtil { * @Return: java.lang.String */ public static String changeTimeValue (String timeStr) { - if (StringUtils.isNotBlank(timeStr)) { - timeStr = "str_to_date('" + timeStr + "','%Y-%m-%d %H:%i:%s')"; - } else { - timeStr = "null"; - } + + if (StringUtils.isNotBlank(timeStr)) { + List timeList = Arrays.asList(timeStr.split(",")); + + List collect = timeList.stream() + .map(item -> "str_to_date('" + item + "','%Y-%m-%d')") + .collect(Collectors.toList()); + timeStr ="concat(" + String.join(", \',\' ,", collect) + ")"; + } else { + timeStr = "null"; + } return timeStr; } @@ -133,7 +143,7 @@ public class FieldConvertUtil { String mustValue = "'"+ UUIDUtils.randomUUID20() + "','" + id + "','0','" + LoginUserUtil.getUserId() + "'"; Date date = new Date(); - SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); String nowTime = sf.format(date); String timeValue = "," + changeTimeValue(nowTime); mustValue += timeValue + timeValue; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 4ed21b75..fc9e9e94 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -390,10 +390,10 @@ and ITEMS_NAME like CONCAT('%', #{itemsName},'%') - and XCXSSRQ=#{XCXSSRQ} + and XCXSSRQ like concat('%', #{XCXSSRQ},'%') - and ZCCSSRQ=#{ZCCSSRQ} + and ZCCSSRQ like concat('%',#{ZCCSSRQ},'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index fbf42949..0a26ccec 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -17,7 +17,11 @@ wg_leader, draft_time, release_time, - unit + unit, + (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,res_person) ) as res_personName, + (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,wg_leader) ) as wg_leaderName @@ -206,4 +210,12 @@ #{id} + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml new file mode 100644 index 00000000..bfd205dd --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml new file mode 100644 index 00000000..883a0e98 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -0,0 +1,19 @@ + + + + + + UPDATE file_material + SET is_top = ( + ( + SELECT + Max(is_top) + FROM + (SELECT * FROM file_material) AS x + ) + 1 + ) + WHERE + id = #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml new file mode 100644 index 00000000..523a9b7f --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml index 533cc110..eb04e434 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml @@ -3,7 +3,7 @@ - id,title,date,content,type,attend,files + id,title,date,content,type,attend,files,place type = #{type} @@ -19,6 +19,7 @@ type, attend, files, + place, values @@ -29,6 +30,7 @@ #{type}, #{attend}, #{files}, + #{place}, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 48a8f2af..982af830 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -37,19 +37,20 @@ + modify_time, creation_time, valid_flag, stand_status, replaced_stand_num,replace_stand_num, - put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort,text_status_buss + put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort,text_status_buss,stand_number SAR_BUSSIONESS_STAND.modify_time, SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year, stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name, - stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss + stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number @@ -168,6 +169,7 @@ stand_Nature, stand_sort, stand_year, + stand_number, #{modifyTime, jdbcType=TIMESTAMP}, @@ -187,6 +189,7 @@ #{standNature, jdbcType=VARCHAR}, #{standSort, jdbcType=VARCHAR}, #{standYear, jdbcType=VARCHAR}, + #{standNumber, jdbcType=VARCHAR}, @@ -246,6 +249,9 @@ stand_year = #{standYear}, + + stand_number = #{standNumber}, + where id = #{id} @@ -301,6 +307,9 @@ stand_year = #{standYear}, + + stand_number = #{standNumber}, + where id = #{id} @@ -373,7 +382,7 @@ when tmp_tb.stand_code like concat('%', 'Q/QCFLC', '%') THEN 16 ELSE 17 END, - tmp_tb.stand_sort ASC + tmp_tb.stand_sort ASC,CAST(tmp_tb.STAND_NUMBER AS decimal(9,2)) ASC,tmp_tb.STAND_YEAR DESC,tmp_tb.id ORDER BY diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml new file mode 100644 index 00000000..05dd5f85 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml new file mode 100644 index 00000000..86929393 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index d466c37e..5e8f9d90 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -38,11 +38,14 @@ select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID, - ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE, + ts_user.INSTITUTION_ID,ts_institution.name as INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE, ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE, ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname from ts_user + left join ts_institution on ts_user.INSTITUTION_ID=ts_institution.id WHERE 1=1 and ts_user.USID in diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 0984ff19..836adab6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -44,6 +44,86 @@ #{item} + UNION ALL + + SELECT + a.ID, + a.STAND_CODE AS standNumber, + a.STAND_NAME AS standName, + a.STAND_EN_NAME, + b.NYLXCLASS, + null AS SSRQ, + null AS XCXSSRQGJ, + null AS ZCCSSRQGJ, + null as ZRBM, + null as SYCPX, + null as CYCVPPSBM, + null as CYCVPPSCN, + null as KCCVPPSBM, + null as KCCVPPSCN, + null as typeApplicable, + dicstandSort.DIC_TYPE_NAME AS standSortShow, + null as standYear, + null as issueTime, + null asstandType, + null AS textStatus + FROM + sar_bussioness_stand a + LEFT JOIN sar_buss_stand_attr_info b ON a.ID = b.STAND_ID + LEFT JOIN TS_DICTYPE dicstandSort ON ( + dicstandSort.dic_type_code = a.stand_sort + AND dicstandSort.dic_id IS NOT NULL + AND dicstandSort.valid_flag = 0 + AND dicstandSort.PARENT_ID IS NULL + ) + + a.ID IN + + #{item} + + + + UNION ALL + + SELECT + a.ID, + a.LAWS_NUMBER AS standNumber, + a.LAWS_NAME AS standName, + a.LAWS_EN_NAME as STAND_EN_NAME, + b.NYLXLAWS, + b.SSRQLAWS AS SSRQ, + b.XCXSSRQLAWS AS XCXSSRQGJ, + b.ZCXSSRQLAWS AS ZCCSSRQGJ, + b.ZRBMLAWS as ZRBM, + null as SYCPX, + null as CYCVPPSBM, + null as CYCVPPSCN, + null as KCCVPPSBM, + null as KCCVPPSCN, + null as typeApplicable, + dicstandSort.DIC_TYPE_NAME AS standSortShow, + a.LAWS_YEAR as standYear, + a.ISSUE_TIME as issueTime, + null asstandType, + null AS textStatus + FROM + sar_laws_stand_info a + LEFT JOIN sar_laws_attr_info b ON a.ID = b.LAWS_ID + LEFT JOIN TS_DICTYPE dicstandSort ON ( + dicstandSort.dic_type_code = a.LAWS_TYPE + AND dicstandSort.dic_id IS NOT NULL + AND dicstandSort.valid_flag = 0 + AND dicstandSort.PARENT_ID IS NULL + ) + + a.ID IN + + #{item} + + + + + + + + left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id + LEFT JOIN TS_DICTYPE dicstandTextStatus ON ( + dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + + LEFT JOIN TS_DICTYPE laws_sycx_show ON ( + dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYCX + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + + LEFT JOIN TS_DICTYPE laws_syqy_show ON ( + dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYQY + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + + LEFT JOIN TS_DICTYPE laws_type_show ON ( + dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TYPE + AND dicstandTextStatus.dic_id IS NOT NULL + AND dicstandTextStatus.valid_flag = 0 + ) + left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = SAR_LAWS_STAND_INFO.id and SAR_LAWS_ATTR_INFO.valid_flag=0) + where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0 + + + + and SAR_LAWS_STAND_INFO.LAWS_TYPE like concat(concat('%',#{lawsType}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%') + + + and (LAWS_NAME like concat(concat('%',#{numberName}),'%') + or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%')) + + + and LAWS_NAME like concat(concat('%',#{lawsName}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{lawsEnName}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_NO like concat(concat('%',#{lawsNo}),'%') + + + and DATE_FORMAT(SAR_LAWS_STAND_INFO.ISSUE_TIME,'%Y-%m-%d') = #{issueTime} + + + and SAR_LAWS_STAND_INFO.ISSUE_COMPANY like concat(concat('%',#{issueCompany}),'%') + + + and DATE_FORMAT(SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START ,'%Y-%m-%d') = DATE_FORMAT(#{commentCycleStart},'%Y-%m-%d') + + + and DATE_FORMAT(SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END ,'%Y-%m-%d') = DATE_FORMAT(#{commentCycleEnd},'%Y-%m-%d') + + + and SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE = #{lawsTextState} + + + and FIND_IN_SET(#{lawsSyqy},SAR_LAWS_STAND_INFO.LAWS_SYQY) + + + and FIND_IN_SET(#{lawsSycx},SAR_LAWS_STAND_INFO.LAWS_SYCX) + + + and SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS = #{isRelateAccess} + + + and SAR_LAWS_STAND_INFO.LAWS_YEAR like concat(concat('%',#{lawsYear}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM like concat(concat('%',#{lawsNotisyncNum}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_BULLETIN like concat(concat('%',#{lawsBulletin}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_LABEL like concat(concat('%',#{lawsLabel}),'%') + + + and SAR_LAWS_STAND_INFO.LAWS_REMARK like concat(concat('%',#{lawsRemark}),'%') + + + + and SAR_LAWS_STAND_INFO.country = #{country} + + + + and SAR_LAWS_MENU.MENU_ID in + + #{item} + + + + + + and SAR_LAWS_MENU.MENU_ID in + + #{item} + + + + + and SAR_LAWS_STAND_INFO.id in + + #{item} + + + + + + and SAR_LAWS_STAND_INFO.id in ( + select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 + and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND') + and TS_PERSON_COLLECT.user_id=#{userId} + ) + + + + and (${advanceSearchStr}) + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 8beb3f8a..7809c344 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -3,8 +3,47 @@ + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index 51417d7d..604fb89c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -39,6 +39,17 @@ + + update sar_stand_project_library + + set detailed_list_version = #{version} where id in + + #{item} + + + + + @@ -349,4 +360,12 @@ + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml index 305cb1c0..91414c6f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -31,7 +31,7 @@ - SELECT sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType from @@ -49,13 +49,45 @@ and RESPONSIBLE_UNIT = #{sar.responsibleUnit} - and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%') - or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%') + and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc limit #{start},#{end} - + SELECT + c.* + FROM + ( + SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* ,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_institution.name as responsibleUnit FROM + (sar_stand_unqualified,(SELECT @i:=0)j) + left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id + left join ts_user on ts_user.USID = sar_stand_unqualified.DUTY_ENGINEER + left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID + WHERE + sar_stand_unqualified.close_state = 1 + + and sar_stand_unqualified.STAND_ID = #{standId} + + + and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%') + + + and ts_institution.name like concat('%',#{sar.responsibleUnit},'%') + + + and (REPLACE(sar_stand_unqualified.STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%') + or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')) + + order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc + limit #{start},#{end} + )c + ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml new file mode 100644 index 00000000..1e2ee222 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + warning.id AS ID, + sarInfo.ID AS STAND_ID, + sarInfo.STAND_TYPE, + CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, + sarInfo.STAND_NAME, + sarInfo.PUT_TIME, + attr.SSRQ as SSRQ + + + + + + + AND trim(replace(CONCAT( + sarInfo.STAND_SORT, + ' ', + sarInfo.STAND_NUMBER, + '-', + sarInfo.STAND_YEAR + ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ','')) + + + AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%') + + + AND ( + DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( + #{waringEO.endPutTime}, + '%Y-%m-%d' + ) + AND + DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') <= DATE_FORMAT( + #{waringEO.endPutTime}, + '%Y-%m-%d' + ) + ) + + + AND ( + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d') + AND + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' ) + ) + + + + + warning.id AS ID, + sarInfo.ID AS STAND_ID, + sarInfo.STAND_TYPE, + CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE, + sarInfo.STAND_NAME, + sarInfo.PUT_TIME, + attr.SSRQ as SSRQ, + case stand_type + when 'INLAND' then '国内标准' + when 'FOREIGN' then '国外标准' + ELSE '' + END + as standTypeShow + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml index 905fe1e1..44bd0401 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml @@ -3,33 +3,24 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - SELECT - info.ID, - info.STAND_SORT, - info.STAND_YEAR, - info.STAND_NUMBER, - info.STAND_NAME, - info.STAND_TYPE, - attrInfo.CLLX, - attrInfo.ZRGCS, - attrInfo.SSRQ, - attrInfo.${str} + info.ID FROM sar_standards_info AS info JOIN sar_stand_attr_info AS attrInfo ON info.id = attrinfo.stand_id diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml index 18a45507..c2ffba00 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml @@ -19,7 +19,7 @@ - SELECT items.ID, items.ITEMS_NUM, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index ab43a5b0..fae06ed8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -4,30 +4,137 @@ - REPLACE INTO sar_stand_warning (ID,STAND_ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NUM,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER) + REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER) VALUES ( #{item.id} ,#{item.standId} - ,#{item.standType} - ,#{item.standCode} - ,#{item.standName} - ,#{item.putTime} - ,#{item.applyType} - ,#{item.dutyEngineer} ,#{item.itemsId} - ,#{item.itemsNum} - ,#{item.itemsName} ,#{item.policyId} - ,#{item.policyName} ,#{item.mark} ,#{item.power} ) + + UPDATE sar_stand_warning + SET POWER ='0' + WHERE + STAND_ID IN ( + SELECT + law_id + FROM + warning_date + WHERE + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') + UNION + SELECT + ID + FROM + sar_standards_info + WHERE + DATE_FORMAT(PUT_TIME, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') + UNION + SELECT + STAND_ID + FROM + sar_stand_items + WHERE + DATE_FORMAT(XCXSSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') + OR DATE_FORMAT(ZCCSSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') + ) + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index 41097a19..2f9f57ad 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -6,4 +6,83 @@ resultType="com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarBaseStandardInfo"> select distinct STAND_ID as standard_id, STAND_NUMBER as standard_number, STAND_NAME as standard_name, STAND_TYPE as standard_type, INTERPRETATION_TIME from sar_interpretation_national_standard + + + update sar_interpretation_national_standard set risk_degree = #{find.riskDegree} + where sar_interpretation_national_standard.STAND_ID = #{find.standId} + and sar_interpretation_national_standard.STAND_NUMBER =#{find.standNumber} + and sar_interpretation_national_standard.STAND_NAME=#{find.standName} + and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml index b82994ed..2bad2b79 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml @@ -3,5 +3,64 @@ + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 883b7e4c..1e6d26f7 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -79,19 +79,19 @@ dicstandTextStatus.DIC_TYPE_NAME AS standTextStatusShow, ( CASE - WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '9999-01-01' + WHEN SAR_STAND_ATTR_INFO.SSRQ ='' THEN '' ELSE SAR_STAND_ATTR_INFO.SSRQ END ) AS SSRQ, ( CASE - WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '9999-01-01' + WHEN SAR_STAND_ATTR_INFO.ZCCSSRQ ='' THEN '' ELSE SAR_STAND_ATTR_INFO.ZCCSSRQ END ) AS ZCCSSRQ, ( CASE - WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '9999-01-01' + WHEN SAR_STAND_ATTR_INFO.XCXSSRQ ='' THEN '' ELSE SAR_STAND_ATTR_INFO.XCXSSRQ END ) AS XCXSSRQ @@ -441,10 +441,11 @@ and ( - (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', - SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '') - or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%') - and SAR_STANDARDS_INFO.STAND_YEAR = '') + (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) + ) + or (stand_name like concat(concat('%',#{standNumber}),'%')) ) @@ -603,7 +604,7 @@ when 'HJ' THEN 7 ELSE 8 END, - sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id + sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS decimal(9,2)) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id CASE sar_standards_info.stand_sort @@ -633,7 +634,7 @@ when 'ADR' THEN 23 ELSE 24 END, - sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id + sar_standards_info.stand_sort ASC,CAST(sar_standards_info.STAND_NUMBER AS decimal(9,2)) ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id @@ -757,16 +758,20 @@ (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) - and SAR_STANDARDS_INFO.STAND_YEAR = '') - or (stand_name like concat(concat('%',#{page.standNumber}),'%')) + + or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) ) + + ) + + ) and stand_name like concat(concat('%',#{page.standName}),'%') - or STAND_NUMBER like concat(concat('%',#{page.standName}),'%') - or STAND_YEAR like concat(concat('%',#{page.standName}),'%') - or STAND_SORT like concat(concat('%',#{page.standName}),'%') + + + and stand_en_name like concat(concat('%',#{page.standEnName}),'%') @@ -827,9 +832,19 @@ and SAR_STANDARDS_INFO.STAND_YEAR = #{page.standYear} + and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{page.issueTime} + + + and + DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') + between + DATE_FORMAT(#{page.startIssueTime} ,'%Y-%m-%d') + and + DATE_FORMAT(#{page.endIssueTime} ,'%Y-%m-%d') + AND dbms_lob.instr(SYNOPSIS, #{page.synopsis} ,1,1) > 0 @@ -884,16 +899,142 @@ + and ( + (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'), + ' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like + trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) + ) + ) + + + + and stand_name like concat(concat('%',#{standName}),'%') + + + and stand_en_name like concat(concat('%',#{standEnName}),'%') + + + + and stand_state = #{standState} + + + + + and stand_nature = #{standNature} + + + + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + + + and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%') + + + and is_relate_access = #{isRelateAccess} + + + + and SAR_STAND_MENU.MENU_ID in + + #{item} + + + + + + and SAR_STAND_MENU.MENU_ID in + + #{item} + + + + + + + + + + + + and SAR_STANDARDS_INFO.id in + + #{item} + + + + and SAR_STANDARDS_INFO.stand_sort = #{standSort} + + + + and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear} + + + and DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') = #{issueTime} + + + and - (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', - SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '') + DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME ,'%Y-%m-%d') + between + DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + and + DATE_FORMAT( #{startIssueTime} ,'%Y-%m-%d') + + + + AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 + + + + + and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus} + + + + and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess} + + + + and SAR_STANDARDS_INFO.id in ( + select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 + and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND') + and TS_PERSON_COLLECT.user_id=#{userId} + ) + + + + + + left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id + where 1=1 and SAR_STANDARDS_INFO.valid_flag=0 + + + + and stand_type = #{standType} + + + + + and country = #{country} + + + + and ( + (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'), + ' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like + trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) + ) + or (trim(replace(stand_name,' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) ) + ) and stand_name like concat(concat('%',#{standName}),'%') - or STAND_NUMBER like concat(concat('%',#{standName}),'%') - or STAND_YEAR like concat(concat('%',#{standName}),'%') - or STAND_SORT like concat(concat('%',#{standName}),'%') and stand_en_name like concat(concat('%',#{standEnName}),'%') @@ -1012,6 +1153,14 @@ GROUP BY SAR_STANDARDS_INFO.id) a + + select SAR_STANDARDS_INFO.id diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml index 528db8c1..b63aa9be 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml @@ -205,7 +205,7 @@ creation_time, modify_time, modify_user, - + edit_flag, fo, duty_engineer, claim_type, @@ -233,7 +233,7 @@ #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, - + #{editFlag,jdbcType=VARCHAR} #{fo, jdbcType=VARCHAR}, #{dutyEngineer, jdbcType=VARCHAR}, #{claimType, jdbcType=VARCHAR}, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml index 38a88987..430e0e6c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml @@ -19,11 +19,12 @@ + - compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type + compare_type, id, old_stand_id, old_stand_num, old_stand_name, new_stand_id, new_stand_num, new_stand_name, old_file_type, old_sar_type, create_user, create_time, modify_user, modify_time, new_file_type, new_sar_type ,compare_status @@ -89,6 +90,9 @@ and new_sar_type ${newSarTypeOperator} #{newSarType} + + + and compare_status = #{compareStatus} and (old_stand_num like concat('%',#{oldNumOrName},'%') OR old_stand_name like concat('%',#{oldNumOrName},'%')) @@ -105,7 +109,7 @@ SELECT SEQ_SAR_STAND_COMPARE_HIS.NEXTVAL FROM DUAL --> insert into SAR_STAND_COMPARE_HIS() - values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}) + values (#{compareType, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{oldStandId, jdbcType=VARCHAR}, #{oldStandNum, jdbcType=VARCHAR}, #{oldStandName, jdbcType=VARCHAR}, #{newStandId, jdbcType=VARCHAR}, #{newStandNum, jdbcType=VARCHAR}, #{newStandName, jdbcType=VARCHAR}, #{oldFileType, jdbcType=VARCHAR}, #{oldSarType, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR},#{compareStatus, jdbcType=VARCHAR}) @@ -131,6 +135,7 @@ modify_time, new_file_type, new_sar_type, + compare_status, #{compareType, jdbcType=VARCHAR}, @@ -149,6 +154,7 @@ #{modifyTime, jdbcType=TIMESTAMP}, #{newFileType, jdbcType=VARCHAR}, #{newSarType, jdbcType=VARCHAR}, + #{compareStatus, jdbcType=VARCHAR}, @@ -169,7 +175,8 @@ modify_user = #{modifyUser}, modify_time = #{modifyTime}, new_file_type = #{newFileType}, - new_sar_type = #{newSarType} + new_sar_type = #{newSarType}, + compare_status = #{compareStatus} where id = #{id} @@ -222,6 +229,9 @@ new_sar_type = #{newSarType}, + + compare_status = #{compareStatus}, + where id = #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index c36b52f1..ea868ac2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -312,6 +312,56 @@ ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a + + - select wg_dept.* ,ts_user.UNAME as name ,ts_user.PHONE as phone ,ts_user.EMAIL as email,ts_user.INSTITUTION_ID as deptId - ,ts_user.INSTITUTION_NAME as deptName + select wg_dept.* ,ts_user.UNAME as name ,wg_dept.PHONE as phone ,wg_dept.EMAIL as email,ts_user.INSTITUTION_ID as deptId + ,t2.name as deptName ,ts_institution.name as unitName , ts_institution.id as unit from wg_dept left join ts_user on ts_user.ACCOUNT = wg_dept.dept_people_id + left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID) + left join ts_institution t2 on t2.id=ts_user.INSTITUTION_ID where wg_dept.wg_id =#{data} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml index 4079378c..0e3da162 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingUserRelation/WgMeetingUserRelationMapper.xml @@ -12,7 +12,7 @@ - select wg_net_info.net_id,ts_user.UNAME as name ,ts_user.PHONE as phone, ts_user.EMAIL as email + select wg_net_info.net_id,ts_user.UNAME as name ,wg_net_info.PHONE as phone, wg_net_info.EMAIL as email ,wg_net_info.id,wg_net_info.wg_id , wg_net_info.join_id from wg_net_info left join ts_user on ts_user.ACCOUNT = wg_net_info.net_id @@ -11,11 +11,12 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml index 3ad98715..911ee3ff 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml @@ -21,7 +21,7 @@ and name like concat('%',#{name},'%') - and project_id = #{project_id} + and project_id = #{projectId} and project_name = #{project_name} @@ -111,7 +111,7 @@ name = #{name}, - project_id = #{project_id}, + project_id = #{projectId}, project_name = #{project_name}, @@ -254,7 +254,7 @@ #{name}, - #{project_id}, + #{projectId}, #{project_name}, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml index 51767b4d..d834b30d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -3,7 +3,7 @@ - id,name,cost,use,annex + id,name,cost,purposes,annexs @@ -12,18 +12,17 @@ and id = #{id} - and name like concat('%',#{name},'%') + and name = #{name} - and cost like concat('%',#{cost},'%') + and cost = #{cost} - - and use like concat('%',#{use},'%') + + and purposes = #{purposes} - - and annex = #{annex} + + and annexs = #{annexs} - + + - select - - from TS_USER where account = #{account} and VALID_FLAG != 1 + select usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type + ,t2.name as INSTITUTION_NAME,INSTITUTION_ID,SEX,PHONE,ts_institution.name as upDeptName,ts_institution.id as upDeptId + from TS_USER + left join ts_institution ON ts_institution.id = (SELECT parent_id from ts_institution WHERE id = ts_user.INSTITUTION_ID) + left join ts_institution t2 on ts_user.INSTITUTION_ID=t2.id + where account = #{account} and VALID_FLAG != 1 + +