diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index a724e332..8d9ef5de 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -88,8 +88,40 @@ public class ActSarItemsEOService { @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: 标准入库流程数据保存 + * @Description: 标准解读流程入库" * @Author: yangxuenan * @Date: 2020/12/7 13:48 * @Param: [standJson] diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6b97ffad..5b30f553 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 07469001..77e9adad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -96,7 +96,7 @@ public class SarLawsAttrDetailedListController extends BaseController + * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-15 +*/ +@RestController +@Api(tags = "福田标准法规--标准法规库-模块树结构") +@RequestMapping("/${restPath}/sarModelTree") +public class SarModelTreeController extends BaseController { + + @Autowired + private ISarModelTreeService iSarModelTreeService; + + @ApiOperation("查询所有资源") + @GetMapping("/list") + public ResponseMessage> getAll(SarModelTree sarVppsTree){ + List tsResources = iSarModelTreeService.getAll(sarVppsTree); + return Result.success(tsResources); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java new file mode 100644 index 00000000..f26aeef4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/dao/SarModelTreeDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarModelTree.dao; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface SarModelTreeDao extends BaseMapper { + +} 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 new file mode 100644 index 00000000..cbdd10d2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -0,0 +1,68 @@ +package com.adc.da.slrs.sarModelTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +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; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarModelTree对象", description="") +public class SarModelTree extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private String id; + + @TableField("NAME") + private String name; + + @TableField("PID") + private String pid; + + @TableField("MODEL") + private String model; + + @ApiModelProperty(value = "模块结构特性") + @TableField("FEATURES") + private String features; + + @ApiModelProperty(value = "删除标识 1：未删除 2：已删除") + @TableField("DEL_FLAG") + private String delFlag; + + @ApiModelProperty(value = "排序序号") + @TableField("SORT") + private Integer sort; + + @ApiModelProperty(value = "子菜单") + @TableField(exist = false) + private List children; + + @ApiModelProperty(value = "上级菜单名称") + @TableField(exist = false) + private String parentIdsName; + + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java new file mode 100644 index 00000000..b1d2c3f3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/ISarModelTreeService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarModelTree.service; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface ISarModelTreeService extends IService { + + List getAll(SarModelTree sarModelTree); + +} 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 new file mode 100644 index 00000000..e3e3c907 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -0,0 +1,53 @@ +package com.adc.da.slrs.sarModelTree.service.impl; + +import com.adc.da.slrs.sarModelTree.entity.SarModelTree; +import com.adc.da.slrs.sarModelTree.dao.SarModelTreeDao; +import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Service +public class SarModelTreeServiceImpl extends ServiceImpl implements ISarModelTreeService { + + /** + * 查询所有菜单 + * @param sarModelTree + */ + @Override + public List getAll(SarModelTree sarModelTree) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.isNull("PID"); + List list = this.baseMapper.selectList(tsResourceQueryWrapper); + for(SarModelTree tree:list){ + tree.setChildren(recursionGetChildren((tree))); + } + return list; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetChildren(SarModelTree parent){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.orderByAsc("SORT"); + sarMenuQueryWrapper.eq("PID",parent.getId()); + List children=this.baseMapper.selectList(sarMenuQueryWrapper); + for(SarModelTree sarMenu:children){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return children; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 7ef6ef5f..8985ecd5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -187,8 +187,8 @@ public class SarStandAttrInfo extends BaseEntity { private String sycpx; @ApiModelProperty(value = "适用认证") - @TableField("SYZD") - private String syzd; + @TableField("SYRZ") + private String syrz; @ApiModelProperty(value = "责任工程师") @TableField("ZRGCS") 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 14e15752..c4e545c4 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 @@ -150,11 +150,11 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 461fd1da..29a332d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -1,26 +1,20 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller; - import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; -import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; -import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.net.URLEncoder; import java.util.*; /** @@ -37,7 +31,6 @@ import java.util.*; public class SarStandProjectLibraryController extends BaseController { @Resource private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService; - /** * * @param Page @@ -71,7 +64,14 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.queryById(id); return Result.success("200",list); } - + /** + * + * @param current + * @param pageSize + * @return + * @author zj + * date 2021-07-13 + **/ @GetMapping("/queryProjectManager") @ApiOperation("查询产品线项目经理") public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize){ @@ -89,6 +89,89 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.queryStandId(id); + List list1 = new ArrayList(); + for(SarStandProjectLibrary s:list){ + list1.add(s.getStandId()); + } + System.out.println(list1); + IPage list2 = sarStandProjectLibraryService.queryStandInfo(current,pageSize,id); + return Result.success("200",list2); + } + /** + * + * @param id + * @return + * @author zj + * date 2021-07-15 + **/ + @PostMapping("/deleteByIds") + @ApiOperation("批量删除标准") + public ResponseMessage deleteByIds(String id){ + String[] ids = id.split(","); + List list = Arrays.asList(ids); + sarStandProjectLibraryService.deleteByIds(list); + return Result.success("200","删除成功"); + } + /** + * + * @param list + * @return + * @author zj + * date 2021-07-15 + **/ + @PostMapping("/batchInsert") + @ApiOperation("调取标准") + public ResponseMessage batchInsert(@RequestBody List list){ + sarStandProjectLibraryService.batchInsert(list); + return Result.success("200","新增成功",list); + } + /** + * + * @param standAttrInfoExcelDto + * @param response + * @return + * @author zj + * date 2021-07-16 + **/ + @ApiOperation("导出Excel表") + @GetMapping(value = "/exportStandAttrInfoExcel") + public void exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto, HttpServletResponse response) throws Exception { + try { + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 + if(standAttrInfoExcelDto.getExportName()==null){ + standAttrInfoExcelDto.setExportName("车型项目详情"); + } + String fileName = URLEncoder.encode(standAttrInfoExcelDto.getExportName(), "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + List data= sarStandProjectLibraryService.exportStandAttrInfoExcel(standAttrInfoExcelDto); + // 这里需要设置不关闭流 + EasyExcel.write(response.getOutputStream(), StandAttrInfoDto.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(data); + } 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/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index e8a6ce92..7316507a 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 @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -17,5 +18,6 @@ import java.util.List; */ public interface SarStandProjectLibraryDao extends BaseMapper { // List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); - + void deleteByIds(@Param("ids") List ids); + void batchInsert(@Param("list") List list); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index 6f0e9dd2..d3897c61 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -68,8 +68,38 @@ public class SarStandProjectLibrary extends BaseEntity { private String projectManager; @ApiModelProperty(value = "项目经理名称") + @TableField(exist = false) private String uName; + //标准编号 + @TableField(exist = false) + private String standId; + //中文名称 + @TableField(exist = false) + private String standName; + //英文名称 + @TableField(exist = false) + private String standEnName; + //标准实施日期 + @TableField(exist = false) + private String ssrq; + //新车型实施日期 + @TableField(exist = false) + private String XCXSSRQGJ; + //在产车实施日期 + @TableField(exist = false) + private String ZCCSSRQGJ; + //责任部门 + @TableField(exist = false) + private String ZRBM; + //关联模块-VPPS + @TableField(exist = false) + private String CYCVPPSBM; + //关联模块-中文名称 + @TableField(exist = false) + private String CYCVPPSCN; + + } 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 new file mode 100644 index 00000000..fe780ba0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * //TODO 添加类/接口功能描述 + * + * @author zhangjin + * @date 2021-07-13 + */ +@Data +@HeadRowHeight(35) +@ColumnWidth(30) +public class StandAttrInfoDto { + + //标准编号 + @ExcelProperty("标准编号") + private String standId; + //中文名称 + @ExcelProperty("中文名称") + private String standName; + //英文名称 + @ExcelProperty("英文名称") + private String standEnName; + //标准实施日期 + @ExcelProperty("标准实施日期") + private String SSRQ; + //新车型实施日期 + @ExcelProperty("新车型实施日期") + private String XCXSSRQGJ; + //在产车实施日期 + @ExcelProperty("在产车实施日期") + private String ZCCSSRQGJ; + //责任部门 + @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; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoExcelDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoExcelDto.java new file mode 100644 index 00000000..e13d44c2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoExcelDto.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * //TODO 添加类/接口功能描述 + * + * @author zhangjin + * @date 2021-07-15 + */ +@Data +public class StandAttrInfoExcelDto { + + String exportName; + + List ids; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandProjectRelationDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandProjectRelationDto.java new file mode 100644 index 00000000..42dffe91 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandProjectRelationDto.java @@ -0,0 +1,18 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Data; + +/** + * //TODO 添加类/接口功能描述 + * + * @author zhangjin + * @date 2021-07-13 + */ +@Data +public class StandProjectRelationDto { + + private String projectId; + + private String standId; + +} 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 e7753bd9..589b0437 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 @@ -1,9 +1,8 @@ package com.adc.da.slrs.sarStandProjectLibrary.service; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; -import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,4 +12,10 @@ public interface SarStandProjectLibraryService { List queryById(String id); IPage queryProjectManager(int current, int pageSize); List queryByProductLine(String productLine); + List queryStandId(String standId); + IPage queryStandInfo(int current, int pageSize, String standId); + void deleteByIds(List ids); + void batchInsert(@Param("ids") List list); + List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto); + } 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 f14b36b1..6f861693 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 @@ -1,10 +1,13 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; -import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlProduct; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; + +import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; +import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -15,6 +18,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -30,6 +35,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryStandId(String standId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("stand_id"); + wrapper.last("INNER JOIN sar_stand_project_relation r ON sar_stand_project_library.id = r.project_id"); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } + + @Override + public IPage queryStandInfo(int current, int pageSize, String standId) { + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); + 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","XCXSSRQGJ","ZCCSSRQGJ","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.setStandName(s.getStandName()); + p.setStandEnName(s.getStandEnName()); + for (SarStandAttrInfo a:list2){ + if(s.getId().equals(a.getStandId())){ + p.setCYCVPPSBM(a.getCycvppsbm()); + p.setCYCVPPSCN(a.getCycvppscn()); + p.setSSRQ(a.getSsrq()); + p.setXCXSSRQGJ(a.getXcxssrqgj()); + p.setZCCSSRQGJ(a.getZccssrqgj()); + p.setKCCVPPSBM(a.getKccvppsbm()); + p.setKCCVPPSCN(a.getKccvppscn()); + p.setZRBM(a.getZrbm()); + } + } + list.add(p); + System.out.println(list); + } + IPage userIPage = new Page<>(); + userIPage.setRecords(list); + userIPage.setTotal(userIPage1.getTotal()); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } + + @Override + public void deleteByIds(List ids) { + sarStandProjectLibraryDao.deleteByIds(ids); + } + + @Override + public void batchInsert(List list) { + sarStandProjectLibraryDao.batchInsert(list); + } + + @Override + public List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto) { + List ids = standAttrInfoExcelDto.getIds(); + List list = new ArrayList<>(); + if (ids==null||ids.size()==0){ + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); + wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID"); + List userList1 = SarStandardsInfoDao.selectList(wrapper1); + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN"); + wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID"); + List userList2 = sarStandAttrInfoDao.selectList(wrapper2); + for(SarStandardsInfo s:userList1){ + StandAttrInfoDto p =new StandAttrInfoDto(); + p.setStandId(s.getId()); + p.setStandName(s.getStandName()); + p.setStandEnName(s.getStandEnName()); + for (SarStandAttrInfo a:userList2){ + if(s.getId().equals(a.getStandId())){ + p.setCYCVPPSBM(a.getCycvppsbm()); + p.setCYCVPPSCN(a.getCycvppscn()); + p.setSSRQ(a.getSsrq()); + p.setXCXSSRQGJ(a.getXcxssrqgj()); + p.setZCCSSRQGJ(a.getZccssrqgj()); + p.setKCCVPPSBM(a.getKccvppsbm()); + p.setKCCVPPSCN(a.getKccvppscn()); + p.setZRBM(a.getZrbm()); + } + } + list.add(p); + } + }else { + String idmis=String.join(",",ids); + System.out.println(idmis); + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.select("ID","STAND_NAME","STAND_EN_NAME"); + wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +")"); + List userList1 = SarStandardsInfoDao.selectList(wrapper1); + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQGJ","ZCCSSRQGJ","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.stand_id in ("+ idmis +")"); + List userList2 = sarStandAttrInfoDao.selectList(wrapper2); + for(SarStandardsInfo s:userList1){ + StandAttrInfoDto p =new StandAttrInfoDto(); + p.setStandId(s.getId()); + p.setStandName(s.getStandName()); + p.setStandEnName(s.getStandEnName()); + for (SarStandAttrInfo a:userList2){ + if(s.getId().equals(a.getStandId())){ + p.setCYCVPPSBM(a.getCycvppsbm()); + p.setCYCVPPSCN(a.getCycvppscn()); + p.setSSRQ(a.getSsrq()); + p.setXCXSSRQGJ(a.getXcxssrqgj()); + p.setZCCSSRQGJ(a.getZccssrqgj()); + p.setKCCVPPSBM(a.getKccvppsbm()); + p.setKCCVPPSCN(a.getKccvppscn()); + p.setZRBM(a.getZrbm()); + } + } + list.add(p); + } + } + return list; + } + private IPage getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper wrapper) { Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); 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 b637499d..d3a8822d 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 @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.controller; +import cn.hutool.core.map.MapUtil; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; @@ -16,12 +17,17 @@ 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; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** *

@@ -98,6 +104,55 @@ public class SarStandardComplianceAssessResultController { } } } + + private static class InsertEntity{ + List entityList; + T eo; + } + + @ApiOperation(value="（插入/更新）标准清单") + @PostMapping("/standard") + public ResponseMessage insertStandard(@RequestBody InsertEntity insertEntity) throws InvocationTargetException, IllegalAccessException { + + SarStandardsInfoEO eo = insertEntity.eo; + + if (eo.getStandApplicationType() == 1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarStandardComplianceProductAssess obj=new SarStandardComplianceProductAssess(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(entityList); + + }else { + if(eo.getPosition()==1){ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + + }else{ + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + } + + + return Result.success(); + } + @ApiOperation(value = "条件查询标准涉及项目符合性清单") @GetMapping("/product") public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { @@ -114,6 +169,17 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } + @ApiOperation(value = "插入标准涉及项目符合性清单") + @PostMapping("/product") + public ResponseMessage insertProduct(List eo) throws Exception { + + iSarStandardComplianceProductAssessService.saveOrUpdateBatch(eo); + + + return Result.success(); + } + + @ApiOperation(value = "条件查询技术审核符合性清单") @GetMapping("/interpretation") public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { @@ -137,4 +203,37 @@ public class SarStandardComplianceAssessResultController { return Result.success(page); } } + + + @ApiOperation(value = "插入技术审核符合性清单") + @PostMapping("/interpretation") + public ResponseMessage insertInterpretation(InsertEntity insertEntity) throws Exception { + + InterpretationEO eo = insertEntity.eo; + + if (eo.getPosition()==1) { + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationNationalStandard obj=new SarInterpretationNationalStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationNationalStandardService.saveOrUpdateBatch(entityList); + } else { + + + + List entityList = new ArrayList<>(); + for (int i = 0; i < insertEntity.entityList.size(); i++) { + SarInterpretationForeignStandard obj=new SarInterpretationForeignStandard(); + BeanUtils.populate(obj, insertEntity.entityList.get(i)); + entityList.add(obj); + } + iSarInterpretationForeignStandardService.saveOrUpdateBatch(entityList); + + } + + return Result.success(); + } } 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 8c3a3177..c35efe84 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 @@ -419,6 +419,15 @@ public class SarStandardsInfoController extends BaseController } } + + @ApiOperation(value = "标准发布查询") + @GetMapping("/getStandInfoByList") + //@RequiresPermissions("lawss:sarStandardsInfo:get") + public ResponseMessage> getStandInfoByList(String limit) throws Exception { + List result = sarStandardsInfoEOService.getStandInfoByList(limit); + return Result.success(result); + } + @ApiOperation(value = "|SarStandardsInfoEO|详情") @GetMapping("/getStandInfoById") //@RequiresPermissions("lawss:sarStandardsInfo:get") 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 98bc1851..5fa8089c 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 @@ -29,6 +29,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO); + List queryStandInfoByList(@Param("limit") Integer limit); + Integer selectStandColumn(@Param("columnName") String columnName); Integer selectCounterStandardsCount(SarStandardsInfo sarStandardsInfoEO); 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 df2df62e..f61bd816 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 @@ -154,6 +154,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 @TableField(exist = false) + private Map attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染 + @TableField(exist = false) private String sarStandAttrEOStr; //新增修改时属性表信息 @TableField(exist = false) private String menuId; //目录ID 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 3d021796..b3fc3d01 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 @@ -31,6 +31,8 @@ public interface ISarStandardsInfoService extends IService { List selectStandardsByStandnumber(String replaceStandNum, String standType); + List getStandInfoByList(String limit); + SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception; public void attrInfoDetails (SarStandardsInfo row) 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 33c619a5..c3e1a681 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 @@ -286,10 +286,61 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl transformUpperCase(Map orgMap) { + Map resultMap = new HashMap<>(); + + for (Map.Entry entry : orgMap.entrySet()) { + String newKey = entry.getKey().toLowerCase(); + resultMap.put(newKey, orgMap.get(entry.getKey())); + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && !InitStandAttrUtil.fileFieldList.isEmpty() && InitStandAttrUtil.fileFieldList.contains(entry.getKey())) { + String value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + if(!fileObj.isEmpty()){ + resultMap.put(newKey + "Name", fileObj.get(0).getOldFileName()); + } + } + } + } + + return resultMap; + } + + public void attrInfoShowDetails(List sarlist) throws Exception { + for (SarStandardsInfo row : sarlist) { + attrInfoDetails(row); + Map getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) { + value = entry.getValue().toString(); + if (StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + entry.setValue(value); + } + } + } + } + } + public void attrInfoShow(List sarlist) throws Exception { for (SarStandardsInfo row : sarlist) { attrInfoDetails(row); @@ -1778,6 +1829,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getStandInfoByList(String limit){ + return dao.queryStandInfoByList(Integer.valueOf(limit)); + } + /** * 新增过程中验证标准号 * @@ -1800,7 +1856,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0) { List sarStandardsInfoEOList = new ArrayList<>(); sarStandardsInfoEOList.add(resultlist.get(0)); - attrInfoShow(sarStandardsInfoEOList); + attrInfoShowDetails(sarStandardsInfoEOList); sarStandardsInfoEO = sarStandardsInfoEOList.get(0); } // 查询纳入清单的国家地区 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java index 735b69dc..5eb54a3a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/dao/SarModelDao.java @@ -8,8 +8,8 @@ import java.util.List; public interface SarModelDao extends BaseMapper { - @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and isnull(pid)") - List findTreeAll(); - @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and pid = #{pid}") - List selectList(@Param("pid") String pid); +// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and isnull(pid)") +// List findTreeAll(); +// @Select("select id,pid,CONCAT(name,model) name,features from sar_model_tree where 1=1 and pid = #{pid}") +// List selectList(@Param("pid") String pid); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java index af7f22c2..d50927e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/entity/SarVPPS.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarTree.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="SarVPPS对象", description="") +@TableName(value = "sar_vpps_tree") public class SarVPPS extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java index 729a9f06..586be308 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarModelServiceImpl.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarTree.service.impl; import com.adc.da.slrs.sarTree.dao.SarModelDao; import com.adc.da.slrs.sarTree.entity.SarModel; import com.adc.da.slrs.sarTree.service.SarModelService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,8 +24,10 @@ public class SarModelServiceImpl implements SarModelService { @Override public List findTreeAll() { //查询父级都为null的数据 - List sarVppsList = sarModelDao.findTreeAll(); - for (SarModel sarVppsOne : sarVppsList) { + QueryWrapper qw = new QueryWrapper<>(); + qw.isNull("pid"); + List sarVppsList = sarModelDao.selectList(qw); + for (SarModel sarVppsOne:sarVppsList) { sarVppsOne.setChildren(getChildren(sarVppsOne)); } return sarVppsList; @@ -32,14 +35,15 @@ public class SarModelServiceImpl implements SarModelService { /** * 递归调用获取子节点 - * * @param parent：父节点 * @return List */ - private List getChildren(SarModel parent) { + private List getChildren(SarModel parent){ String pid = parent.getId(); - List children = sarModelDao.selectList(pid); - for (SarModel sarVppsOne : children) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pid",parent.getId()); + List children=sarModelDao.selectList(qw); + for(SarModel sarVppsOne:children){ sarVppsOne.setChildren(getChildren((sarVppsOne))); } return children; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java index 30db1809..d4ce1aba 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarTree/service/impl/SarVPPSServiceImpl.java @@ -24,7 +24,9 @@ public class SarVPPSServiceImpl implements SarVPPSService { @Override public List findTreeAll() { //查询父级都为null的数据 - List sarVppsList = sarVPPSDao.findTreeAll(); + QueryWrapper qw = new QueryWrapper<>(); + qw.isNull("pid"); + List sarVppsList = sarVPPSDao.selectList(qw); for (SarVPPS sarVppsOne:sarVppsList) { sarVppsOne.setChildren(getChildren(sarVppsOne)); } @@ -38,7 +40,9 @@ public class SarVPPSServiceImpl implements SarVPPSService { */ private List getChildren(SarVPPS parent){ String pid = parent.getId(); - List children = sarVPPSDao.selectList(pid); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("pid",parent.getId()); + List children=sarVPPSDao.selectList(qw); for(SarVPPS sarVppsOne:children){ sarVppsOne.setChildren(getChildren((sarVppsOne))); } 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 new file mode 100644 index 00000000..9f78cba2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java @@ -0,0 +1,41 @@ +package com.adc.da.slrs.sarVppsTree.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService; +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.sarVppsTree.entity.SarVppsTree; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-15 +*/ +@RestController +@Api(tags = "福田标准法规--标准法规库-Vpps树结构") +@RequestMapping("/${restPath}/sarVppsTree") +public class SarVppsTreeController extends BaseController { + + @Autowired + private ISarVppsTreeService iSarVppsTreeService; + + @ApiOperation("查询所有资源") + @GetMapping("/list") + public ResponseMessage> getAll(SarVppsTree sarVppsTree){ + List tsResources = iSarVppsTreeService.getAll(sarVppsTree); + return Result.success(tsResources); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java new file mode 100644 index 00000000..b91948c6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/dao/SarVppsTreeDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarVppsTree.dao; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface SarVppsTreeDao extends BaseMapper { + +} 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 new file mode 100644 index 00000000..e9fb22cf --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java @@ -0,0 +1,76 @@ +package com.adc.da.slrs.sarVppsTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableId; +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; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarVppsTree对象", description="") +public class SarVppsTree extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("ID") + private String id; + + @ApiModelProperty(value = "VPPS编码") + @TableField("VPPS_CODE") + private String vppsCode; + + @ApiModelProperty(value = "父级id") + @TableField("PID") + private String pid; + + @ApiModelProperty(value = "编码") + @TableField("CODE") + private String code; + + @ApiModelProperty(value = "中文名称") + @TableField("CHINESE_NAME") + private String chineseName; + + @ApiModelProperty(value = "中文名称") + @TableField("ENGLISH_NAME") + private String englishName; + + @ApiModelProperty(value = "删除标识 1：未删除 2：已删除") + @TableField("DEL_FLAG") + private String delFlag; + + @ApiModelProperty(value = "排序序号") + @TableField("SORT") + private Integer sort; + + @ApiModelProperty(value = "子菜单") + @TableField(exist = false) + private List children; + + @ApiModelProperty(value = "上级菜单名称") + @TableField(exist = false) + private String parentIdsName; + + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java new file mode 100644 index 00000000..910b46ec --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/ISarVppsTreeService.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.sarVppsTree.service; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +public interface ISarVppsTreeService extends IService { + + List getAll(SarVppsTree sarVppsTree); +} 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 new file mode 100644 index 00000000..1a7b51d4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java @@ -0,0 +1,53 @@ +package com.adc.da.slrs.sarVppsTree.service.impl; + +import com.adc.da.slrs.sarVppsTree.entity.SarVppsTree; +import com.adc.da.slrs.sarVppsTree.dao.SarVppsTreeDao; +import com.adc.da.slrs.sarVppsTree.service.ISarVppsTreeService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-15 + */ +@Service +public class SarVppsTreeServiceImpl extends ServiceImpl implements ISarVppsTreeService { + + /** + * 查询所有菜单 + * @param sarVppsTree + */ + @Override + public List getAll(SarVppsTree sarVppsTree) { + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.isNull("PID"); + List list = this.baseMapper.selectList(tsResourceQueryWrapper); + for(SarVppsTree tree:list){ + tree.setChildren(recursionGetChildren((tree))); + } + return list; + } + + /** + * 递归调用获取子节点 + * @param parent：父节点 + * @return List + */ + private List recursionGetChildren(SarVppsTree parent){ + QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); + sarMenuQueryWrapper.orderByAsc("SORT"); + sarMenuQueryWrapper.eq("PID",parent.getId()); + List children=this.baseMapper.selectList(sarMenuQueryWrapper); + for(SarVppsTree sarMenu:children){ + sarMenu.setChildren(recursionGetChildren((sarMenu))); + } + return children; + } +} 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 c671b63c..825a91d6 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,7 @@ 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.standardSplit.entity.SarFileSplitItemsEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEO; import com.adc.da.slrs.standardSplit.entity.SarStandFileEOPage; import com.adc.da.slrs.standardSplit.service.SarStandAttrDetailsEOService; @@ -118,6 +119,9 @@ public class SarStandFileEOController extends BaseController { page.setFileSuffixList(suffix.split(",")); } List rows = sarStandFileEOService.getStandFileListByPage(page); + for (SarStandFileEO one:rows) { + one.setAttId(one.getAttId1()); + } if (rows != null && !rows.isEmpty()) { for (SarStandFileEO sarStandFileEO : rows) { List getField = sarStandAttrDetailsEOService.selectFileFieldForSel(sarStandFileEO.getStandFileClassify()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java index b45d23b3..6e8ef33a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEO.java @@ -21,6 +21,16 @@ public class SarStandFileEO extends BaseEntity { private String validFlag; private String useModel; private String attId; + + public String getAttId1() { + return attId1; + } + + public void setAttId1(String attId1) { + this.attId1 = attId1; + } + + private String attId1; private String resId; private String standId; private String id; 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 d49d5d84..ad78a58f 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 @@ -37,9 +37,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.person.dao.PersonCollectEODao; +import org.springframework.transaction.interceptor.TransactionAspectSupport; @Service -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); @@ -104,6 +104,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } @Override + @Transactional public int fileAplit(SarFileSplitInfoEO sarFileSplitInfoEO){ // 拆分文件主表中插入数据 sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20()); @@ -135,7 +136,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } try { AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); - String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); + String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 XWPFDocument doc = new XWPFDocument(is); @@ -317,6 +319,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } catch (Exception e) { e.printStackTrace(); + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return -1; } if(treeList.size()>0 && messageList.size() > 0){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml new file mode 100644 index 00000000..9541c60b --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarModelTree/SarModelTreeMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 4904402c..6e5cdb19 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 @@ -1,14 +1,27 @@ + + insert into sar_stand_project_relation(project_id,stand_id) VALUES + + (#{list.projectId,jdbcType=VARCHAR},#{list.standId,jdbcType=VARCHAR}) + + - - - - - - - - + + + + + + + + + + delete from sar_stand_project_relation where stand_id in ( + + #{list} + + ) + 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 253602d1..2bc31a08 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 @@ -626,6 +626,16 @@ + +