diff --git a/.gitignore b/.gitignore index 3e0d9aa6..14f81db9 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ target *.bpmn/ *logs/ .metadata + 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 40e96151..ddf9a6f0 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 @@ -75,7 +75,7 @@ public class CodeGen { DataSourceConfig dsc = new DataSourceConfig(); dsc.setUrl("jdbc:mysql://"+DB_IP+"?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false"); //dsc.setSchemaName("public");//PostgreSQL schemaName - dsc.setDriverName("com.mysql.jdbc.Driver"); + dsc.setDriverName("com.mysql.cj.jdbc.Driver"); dsc.setUsername(DB_USER); dsc.setPassword(DB_PWD); mpg.setDataSource(dsc); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/dao/SarLawsAttrInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/dao/SarLawsAttrInfoDao.java index 96114459..8707ba7e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/dao/SarLawsAttrInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrInfo/dao/SarLawsAttrInfoDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarLawsAttrInfo.dao; import com.adc.da.slrs.sarLawsAttrInfo.entity.SarLawsAttrInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -16,6 +17,22 @@ import java.util.Map; */ public interface SarLawsAttrInfoDao extends BaseMapper { + void deleteLawsAttr(@Param("fieldInfo") String fieldInfo); + + void updateAttrLen(@Param("fieldInfo") String fieldInfo); + + Integer selectLawsAttrColumn(@Param("columnName") String columnName); + + int insertLawsAttr(@Param("fieldInfo") String fieldInfo,@Param("fieldValue") String fieldValue); + + int deleteLawsAttrByStandId(@Param("standId") String standId); + + int updateLawsInfo(@Param("lawsId") String lawsId,@Param("field") String field,@Param("value") String value); + + String selectFieldValByLawsId(@Param("field") String field, @Param("lawsId") String lawsId); + + void alterLawsAttr(@Param("fieldInfo") String fieldInfo); + Map selectLawsFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInfo/dao/SarLawsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInfo/dao/SarLawsInfoDao.java index 22af14c4..7defe663 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInfo/dao/SarLawsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInfo/dao/SarLawsInfoDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsInfo.dao; import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo; import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,6 +17,8 @@ import java.util.List; */ public interface SarLawsInfoDao extends BaseMapper { + Integer selectLawsColumn(@Param("columnName") String columnName); + List queryByPage(SarLawsInfoEOPage page); Integer queryByCount(SarLawsInfoEOPage page); 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 7469596e..fa5cf2f1 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 @@ -2,16 +2,23 @@ package com.adc.da.slrs.sarStandAttrDetails.controller; import com.adc.da.common.SarTypeEnum; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandAttrDetails.page.SarStandAttrDetailsEOPage; +import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; +import com.adc.da.sys.common.SelectionResult; import com.adc.da.utils.util.InitStandAttrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.HashMap; @@ -27,10 +34,23 @@ import java.util.Map; * @since 2021-06-01 */ @RestController -@Api(tags = "福田标准法规--标准法规库--国内标准法规详情") +@Api(tags = "福田标准法规--标准属性自定义") @RequestMapping("/${restPath}/lawss/sarStandAttrDetails") public class SarStandAttrDetailsController extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(SarStandAttrDetailsController.class); + + @Autowired + private ISarStandAttrDetailsService sarStandAttrDetailsEOService; + + @ApiOperation(value = "|SarStandAttrDetailsEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("lawss:sarStandAttrDetails:page") + public ResponseMessage> page(SarStandAttrDetailsEOPage page) throws Exception { + List rows = sarStandAttrDetailsEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + @ApiOperation(value = "|SarStandAttrDetailsEO|查询") @GetMapping("/list") // @RequiresPermissions("lawss:sarStandAttrDetails:list") @@ -51,4 +71,77 @@ public class SarStandAttrDetailsController extends BaseController find(@PathVariable String id) throws Exception { + return Result.success(sarStandAttrDetailsEOService.getById(id)); + } + + @ApiOperation(value = "|SarStandAttrDetailsEO|新增") + @PostMapping("/createStandAttrDetails") +// @RequiresPermissions("lawss:sarStandAttrDetails:save") + public ResponseMessage create(@RequestBody SarStandAttrDetails sarStandAttrDetailsEO) throws Exception { + String resultMsg = sarStandAttrDetailsEOService.createStandAttrDetails(sarStandAttrDetailsEO); + if ("success".equals(resultMsg)) { + // 重新加载数据 +// sarStandAttrDetailsEOService.getAttrDetails(); + return Result.success("0","新增成功",sarStandAttrDetailsEO); + } else { + return Result.error("0","新增失败,"+resultMsg); + } + } + + @ApiOperation(value = "|SarStandAttrDetailsEO|修改") + @PutMapping("/updateStandAttrDetails") +// @RequiresPermissions("lawss:sarStandAttrDetails:update") + public ResponseMessage update(@RequestBody SarStandAttrDetails sarStandAttrDetailsEO) throws Exception { + String resultMsg = sarStandAttrDetailsEOService.updateStandAttrDetails(sarStandAttrDetailsEO); + if ("success".equals(resultMsg)) { + // 重新加载数据 + sarStandAttrDetailsEOService.getAttrDetails(); + return Result.success("0","修改成功",sarStandAttrDetailsEO); + } else { + return Result.error("0","修改失败,"+resultMsg); + } + } + + @ApiOperation(value = "|SarStandAttrDetailsEO|删除") + @DeleteMapping("/deleteAttrDetailsByIds") +// @RequiresPermissions("lawss:sarStandAttrDetails:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + sarStandAttrDetailsEOService.removeById(id); + logger.info("delete from SAR_STAND_ATTR_DETAILS where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "|SarStandAttrDetailsEO|批量删除") + @PutMapping("/deleteByIds") +// @RequiresPermissions("lawss:sarStandAttrDetails:update") + public ResponseMessage deleteByIds(String ids,String sarType) throws Exception { + String resultMsg = sarStandAttrDetailsEOService.deleteByIds(ids,sarType); + if ("success".equals(resultMsg)) { + // 重新加载数据 + sarStandAttrDetailsEOService.getAttrDetails(); + return Result.success("0","删除成功",null); + } else { + return Result.error("0","删除失败"); + } + } + + @ApiOperation(value = "|SarStandAttrDetailsEO|查询标准中所有文件类型") + @GetMapping("/getFileFieldForSel") +// @RequiresPermissions("lawss:sarStandAttrDetails:get") + public ResponseMessage> getFileFieldForSel(){ + return Result.success(sarStandAttrDetailsEOService.selectFileFieldForSel(null)); + } + + // 标准拆分使用 + @ApiOperation(value = "|SarStandAttrDetailsEO|查询标准中所有文件类型") + @GetMapping("/getFileFieldForSel1") +// @RequiresPermissions("lawss:sarStandAttrDetails:get") + public ResponseMessage> selectFileFieldForSel1(){ + return Result.success(sarStandAttrDetailsEOService.selectFileFieldForSel1(null)); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/dao/SarStandAttrDetailsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/dao/SarStandAttrDetailsDao.java index 7d609729..b36fc74c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/dao/SarStandAttrDetailsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/dao/SarStandAttrDetailsDao.java @@ -1,9 +1,14 @@ package com.adc.da.slrs.sarStandAttrDetails.dao; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; +import com.adc.da.slrs.sarStandAttrDetails.page.SarStandAttrDetailsEOPage; +import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; +import java.util.Map; + /** *

* Mapper 接口 @@ -14,6 +19,20 @@ import org.apache.ibatis.annotations.Param; */ public interface SarStandAttrDetailsDao extends BaseMapper { + List queryByPage(SarStandAttrDetailsEOPage page); + + List queryByList(SarStandAttrDetailsEOPage page); + + Integer queryByCount(SarStandAttrDetailsEOPage page); + + int deleteByIds(@Param("idList") List idList); + + String selectAllFieldToStr(SarStandAttrDetailsEOPage page); + + List selectFileFieldForSel(@Param("attrField") String attrField); + + List selectFileFieldForSel1(@Param("attrField") String attrField); + String selectNameByField(@Param("attrField") String attrField, @Param("sarType") String sarType); SarStandAttrDetails selectFieldByName(@Param("attrName") String attrName, @Param("sarType") String sarType); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/ISarStandAttrDetailsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/ISarStandAttrDetailsService.java index 33684797..4bc37366 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/ISarStandAttrDetailsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/ISarStandAttrDetailsService.java @@ -1,8 +1,12 @@ package com.adc.da.slrs.sarStandAttrDetails.service; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; +import com.adc.da.slrs.sarStandAttrDetails.page.SarStandAttrDetailsEOPage; +import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +17,18 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ISarStandAttrDetailsService extends IService { + List queryByPage(SarStandAttrDetailsEOPage page); + + String createStandAttrDetails (SarStandAttrDetails sarStandAttrDetailsEO); + + String updateStandAttrDetails (SarStandAttrDetails sarStandAttrDetailsEO); + + String deleteByIds (String ids,String sarType); + + void getAttrDetails(); + + List selectFileFieldForSel(String attrField); + + List selectFileFieldForSel1(String attrField); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java index eca61d31..d7682786 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrDetails/service/impl/SarStandAttrDetailsServiceImpl.java @@ -1,11 +1,28 @@ package com.adc.da.slrs.sarStandAttrDetails.service.impl; +import com.adc.da.common.SarTypeEnum; +import com.adc.da.common.StandAttrTypeEnum; +import com.adc.da.slrs.sarLawsAttrInfo.dao.SarLawsAttrInfoDao; +import com.adc.da.slrs.sarLawsInfo.dao.SarLawsInfoDao; import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao; +import com.adc.da.slrs.sarStandAttrDetails.page.SarStandAttrDetailsEOPage; import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; +import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; +import com.adc.da.sys.common.SelectionResult; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; +import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.*; + /** *

* 服务实现类 @@ -17,4 +34,446 @@ import org.springframework.stereotype.Service; @Service public class SarStandAttrDetailsServiceImpl extends ServiceImpl implements ISarStandAttrDetailsService { + private static final Logger logger = LoggerFactory.getLogger(ISarStandAttrDetailsService.class); + + @Autowired + private SarStandAttrDetailsDao dao; + + @Autowired + private SarLawsAttrInfoDao sarLawsAttrInfoDao; + + @Autowired + private SarLawsInfoDao sarLawsInfoEODao; + + @Autowired + private SarStandardsInfoDao sarStandardsInfoDao; + + @Autowired + private SarStandAttrInfoDao sarStandAttrInfoEODao; + +// @Autowired +// private SarBussionessStandDao sarBussionessStandEODao; + + private final static List standTypeList = new ArrayList<>(); + private final static List lawsTypeList = new ArrayList<>(); + + static { + standTypeList.add(SarTypeEnum.STAND.getValue()); + standTypeList.add(SarTypeEnum.INLAND_STAND.getValue()); + standTypeList.add(SarTypeEnum.FOREIGN_STAND.getValue()); + lawsTypeList.add(SarTypeEnum.LAWS.getValue()); + lawsTypeList.add(SarTypeEnum.INLAND_LAWS.getValue()); + lawsTypeList.add(SarTypeEnum.FOREIGN_LAWS.getValue()); + } + + @Override + public List queryByPage(SarStandAttrDetailsEOPage page){ + return dao.queryByPage(page); + } + + /*** + * @Description: + * @Author: yangxuenan + * @Date: 2020/8/17 15:44 + * @Param: [sarStandAttrDetailsEO] + * @Return: void + */ + public String createStandAttrDetails (SarStandAttrDetails sarStandAttrDetailsEO) { + //向属性表增加字段 + String fieldInfo = ""; + String attrType = sarStandAttrDetailsEO.getAttrType(); + String sarType = sarStandAttrDetailsEO.getSarType(); + String attrField = sarStandAttrDetailsEO.getAttrField(); + Long attrLen = sarStandAttrDetailsEO.getAttrLen(); + String validMsg = validAttrInfo(sarStandAttrDetailsEO); + if (StringUtils.isNotBlank(validMsg)) { + return validMsg; + } + // 根据不同字段类型拼接sql参数 + if (StandAttrTypeEnum.INPUT_STR.getValue().equals(attrType) || StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) || StandAttrTypeEnum.SEL_OPTS.getValue().equals(attrType) || StandAttrTypeEnum.FILE.getValue().equals(attrType)) { + fieldInfo = attrField + " varchar(" + String.valueOf(attrLen) + ")"; + } else if (StandAttrTypeEnum.INPUT_NUM.getValue().equals(attrType)) { + fieldInfo = attrField + " int(" + String.valueOf(attrLen) + ")"; + } else if (StandAttrTypeEnum.DATE_PICKER.getValue().equals(attrType)) { + fieldInfo = attrField + " datetime"; + } else if (StandAttrTypeEnum.DATE_PIC_OPTS.getValue().equals(attrType)) { + fieldInfo = attrField + " varchar(500)"; + } else if (StandAttrTypeEnum.TEXTAREA.getValue().equals(attrType) && attrLen < 4000) { + fieldInfo = attrField + " varchar(" + String.valueOf(attrLen) + ")"; + } else if (StandAttrTypeEnum.TEXTAREA.getValue().equals(attrType) && attrLen >= 4000) { + fieldInfo = attrField + " text"; + } + if (StringUtils.isNotBlank(fieldInfo)) { + if (standTypeList.contains(sarType)) { + sarStandAttrInfoEODao.alterStandAttr(fieldInfo); + } else if (lawsTypeList.contains(sarType)) { + sarLawsAttrInfoDao.alterLawsAttr(fieldInfo); + } else if (SarTypeEnum.BUSS.getValue().equals(sarType)) { +// dao.alterStandAttr(fieldInfo); + } + } + //向属性详细信息表添加数据 + sarStandAttrDetailsEO.setId(UUIDUtils.randomUUID20()); + sarStandAttrDetailsEO.setIsEdit("0"); + sarStandAttrDetailsEO.setCreationUser(LoginUserUtil.getUserId()); + sarStandAttrDetailsEO.setValidFlag("0"); + sarStandAttrDetailsEO.setCreationTime(new Date()); + sarStandAttrDetailsEO.setModifyTime(new Date()); + int successCount = dao.insert(sarStandAttrDetailsEO); + if (successCount > 0) { + return "success"; + } else { + return "error"; + } + } + + /*** + * @Description: 验证属性信息 + * @Author: yangxuenan + * @Date: 2020/8/18 10:39 + * @Param: [sarStandAttrDetailsEO] + * @Return: java.lang.String + */ + public String validAttrInfo (SarStandAttrDetails sarStandAttrDetailsEO) { + String attrFfield = sarStandAttrDetailsEO.getAttrField(); + String sarType = sarStandAttrDetailsEO.getSarType(); + // 判断新增字段在属性表中是否已存在 + SarStandAttrDetailsEOPage detailsEOPage = new SarStandAttrDetailsEOPage(); + detailsEOPage.setAttrField(attrFfield); + detailsEOPage.setSarType(sarType); + int countFiled = dao.queryByCount(detailsEOPage); + if (countFiled > 0) { + return "属性字段已存在"; + } + // 判断新增字段在基础表中是否已存在 + Integer count = 0; + if (standTypeList.contains(sarType)) { + count = sarStandardsInfoDao.selectStandColumn(attrFfield); + } else if (lawsTypeList.contains(sarType)) { + count = sarLawsInfoEODao.selectLawsColumn(attrFfield); + } else if (SarTypeEnum.BUSS.getValue().equals(sarType)) { +// count = sarBussionessStandEODao.selectStandColumn(attrFfield); + } + if (count > 0) { + return "属性字段在基础表SAR_STANDARDS_INFO中已存在"; + } + // 判断新增字段在属性表中是否已存在 + Integer countAtt = 0; + if (standTypeList.contains(sarType)) { + countAtt = sarStandAttrInfoEODao.selectStandAttrColumn(attrFfield); + } else if (lawsTypeList.contains(sarType)) { + countAtt = sarLawsAttrInfoDao.selectLawsAttrColumn(attrFfield); + } + if (countAtt > 0) { + return "属性字段在属性表SAR_STAND_ATTR_INFO中已存在"; + } + // 判断属性名称是否已存在 + detailsEOPage.setAttrField(null); + detailsEOPage.setAttrName(sarStandAttrDetailsEO.getAttrName()); + detailsEOPage.setSarType(sarType); + int countName = dao.queryByCount(detailsEOPage); + if (countName > 0) { + return "属性名称已存在"; + } + return ""; + } + + public void getAttrDetails(){ + String queryField = ""; //所有属性表需要查询的字段以逗号分隔 + String queryFieldNames = ""; //所有属性表需要查询的字段名以逗号分隔 + List queryFieldList = new ArrayList<>(); //所有属性表需要查询的字段 + List selectionFieldList = new ArrayList<>(); // 属性表下拉选项类型字段 + List fileFieldList = new ArrayList<>(); // 属性表文件类型字段 + List clobFieldList = new ArrayList<>(); // 属性表clob类型字段 + List timeFieldList = new ArrayList<>(); // 属性表日期类型字段 + List multiTimeFieldList = new ArrayList<>(); // 属性表多个日期类型字段 + List numFieldList = new ArrayList<>(); // 属性表数字类型字段 + List standInlandAttrFieldList = new ArrayList<>(); // 属性表数字类型字段 + List standForeignAttrFieldList = new ArrayList<>(); + Map selectFieldMap = new HashMap<>(); // 下拉属性字段及选项值 + + // 政策属性字段信息 + String queryFieldLaws = ""; //所有属性表需要查询的字段以逗号分隔 + String queryFieldNamesLaws = ""; //所有属性表需要查询的字段名以逗号分隔 + List queryFieldListLaws = new ArrayList<>(); //所有属性表需要查询的字段 + List selectionFieldListLaws = new ArrayList<>(); // 属性表下拉选项类型字段 + List fileFieldListLaws = new ArrayList<>(); // 属性表文件类型字段 + List clobFieldListLaws = new ArrayList<>(); // 属性表clob类型字段 + List timeFieldListLaws = new ArrayList<>(); // 属性表日期类型字段 + List multiTimeFieldListLaws = new ArrayList<>(); // 属性表多个日期类型字段 + List numFieldListLaws = new ArrayList<>(); // 属性表数字类型字段 + List lawsInlandAttrFieldList = new ArrayList<>(); // 属性表数字类型字段 + List lawsForeignAttrFieldList = new ArrayList<>(); + Map selectFieldMapLaws = new HashMap<>(); // 下拉属性字段及选项值 + + // 企标属性字段信息 + String queryFieldBuss = ""; //所有属性表需要查询的字段以逗号分隔 + String queryFieldNamesBuss = ""; //所有属性表需要查询的字段名以逗号分隔 + List queryFieldListBuss = new ArrayList<>(); //所有属性表需要查询的字段 + List selectionFieldListBuss = new ArrayList<>(); // 属性表下拉选项类型字段 + List fileFieldListBuss = new ArrayList<>(); // 属性表文件类型字段 + List clobFieldListBuss = new ArrayList<>(); // 属性表clob类型字段 + List timeFieldListBuss = new ArrayList<>(); // 属性表日期类型字段 + List multiTimeFieldListBuss = new ArrayList<>(); // 属性表多个日期类型字段 + List numFieldListBuss = new ArrayList<>(); // 属性表数字类型字段 + List bussAttrFieldList = new ArrayList<>(); // 属性表数字类型字段 + Map selectFieldMapBuss = new HashMap<>(); // 下拉属性字段及选项值 + + logger.info("新增编辑时加载--查询标准属性类！"); + // 属性表需要查询的字段 + StringBuilder fieldInfoBuilder = new StringBuilder(); + StringBuilder fieldInfoBuilderLaws = new StringBuilder(); + StringBuilder fieldInfoNameBuilder = new StringBuilder(); + StringBuilder fieldInfoNameBuilderLaws = new StringBuilder(); + StringBuilder fieldInfoBuilderBuss = new StringBuilder(); + StringBuilder fieldInfoNameBuilderBuss = new StringBuilder(); + SarStandAttrDetailsEOPage detailsEOPage = new SarStandAttrDetailsEOPage(); + List getDetailsList = dao.queryByList(detailsEOPage); + if (getDetailsList != null && !getDetailsList.isEmpty()) { + logger.info("新增编辑时加载--查询标准属性类--查询到" + getDetailsList.size() + "条属性字段数据！"); + for (SarStandAttrDetails detailsEO : getDetailsList) { + String sarType = detailsEO.getSarType(); + String attrType = detailsEO.getAttrType(); + if (standTypeList.contains(sarType)) { + if (!SarTypeEnum.FOREIGN_STAND.getValue().equals(sarType)) { + standInlandAttrFieldList.add(detailsEO); + } + if (!SarTypeEnum.INLAND_STAND.getValue().equals(sarType)) { + standForeignAttrFieldList.add(detailsEO); + } + fieldInfoBuilder.append(detailsEO.getAttrField() + ","); + fieldInfoNameBuilder.append(detailsEO.getAttrName() + ","); + queryFieldList.add(detailsEO.getAttrField()); + if (StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) || StandAttrTypeEnum.SEL_OPTS.getValue().equals(attrType)) { + selectionFieldList.add(detailsEO.getAttrField()); + selectFieldMap.put(detailsEO.getAttrField(),detailsEO.getSelVal()); + } else if (StandAttrTypeEnum.FILE.getValue().equals(attrType)) { + fileFieldList.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.TEXTAREA.getValue().equals(attrType) && detailsEO.getAttrLen() >= 4000) { + clobFieldList.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.DATE_PICKER.getValue().equals(attrType)) { + timeFieldList.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.DATE_PIC_OPTS.getValue().equals(attrType)) { + multiTimeFieldList.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.INPUT_NUM.getValue().equals(attrType)) { + numFieldList.add(detailsEO.getAttrField()); + } + } else if (lawsTypeList.contains(sarType)) { + if (!SarTypeEnum.FOREIGN_LAWS.getValue().equals(sarType)) { + lawsInlandAttrFieldList.add(detailsEO); + } + if (!SarTypeEnum.INLAND_LAWS.getValue().equals(sarType)) { + lawsForeignAttrFieldList.add(detailsEO); + } + fieldInfoBuilderLaws.append(detailsEO.getAttrField() + ","); + fieldInfoNameBuilderLaws.append(detailsEO.getAttrName() + ","); + queryFieldListLaws.add(detailsEO.getAttrField()); + if (StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) || StandAttrTypeEnum.SEL_OPTS.getValue().equals(attrType)) { + selectionFieldListLaws.add(detailsEO.getAttrField()); + selectFieldMapLaws.put(detailsEO.getAttrField(),detailsEO.getSelVal()); + } else if (StandAttrTypeEnum.FILE.getValue().equals(attrType)) { + fileFieldListLaws.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.TEXTAREA.getValue().equals(attrType) && detailsEO.getAttrLen() >= 4000) { + clobFieldListLaws.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.DATE_PICKER.getValue().equals(attrType)) { + timeFieldListLaws.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.DATE_PIC_OPTS.getValue().equals(attrType)) { + multiTimeFieldListLaws.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.INPUT_NUM.getValue().equals(attrType)) { + numFieldListLaws.add(detailsEO.getAttrField()); + } + } else if (SarTypeEnum.BUSS.getValue().equals(sarType)) { + bussAttrFieldList.add(detailsEO); + fieldInfoBuilderBuss.append(detailsEO.getAttrField() + ","); + fieldInfoNameBuilderBuss.append(detailsEO.getAttrName() + ","); + queryFieldListBuss.add(detailsEO.getAttrField()); + if (StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) || StandAttrTypeEnum.SEL_OPTS.getValue().equals(attrType)) { + selectionFieldListBuss.add(detailsEO.getAttrField()); + selectFieldMapBuss.put(detailsEO.getAttrField(),detailsEO.getSelVal()); + } else if (StandAttrTypeEnum.FILE.getValue().equals(attrType)) { + fileFieldListBuss.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.TEXTAREA.getValue().equals(attrType) && detailsEO.getAttrLen() >= 4000) { + clobFieldListBuss.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.DATE_PICKER.getValue().equals(attrType)) { + timeFieldListBuss.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.DATE_PIC_OPTS.getValue().equals(attrType)) { + multiTimeFieldListBuss.add(detailsEO.getAttrField()); + } else if (StandAttrTypeEnum.INPUT_NUM.getValue().equals(attrType)) { + numFieldListBuss.add(detailsEO.getAttrField()); + } + } + } + queryField = fieldInfoBuilder.toString(); + queryFieldLaws = fieldInfoBuilderLaws.toString(); + queryFieldBuss = fieldInfoBuilderBuss.toString(); + if (StringUtils.isNotBlank(queryField)) { + queryField = queryField.substring(0,queryField.length()-1); + } + if (StringUtils.isNotBlank(queryFieldLaws)) { + queryFieldLaws = queryFieldLaws.substring(0,queryFieldLaws.length()-1); + } + if (StringUtils.isNotBlank(queryFieldBuss)) { + queryFieldBuss = queryFieldBuss.substring(0,queryFieldBuss.length()-1); + } + logger.info("新增编辑时加载--查询标准属性类--查询到属性字段为：" + queryField); + logger.info("新增编辑时加载--查询政策属性类--查询到属性字段为：" + queryFieldLaws); + logger.info("新增编辑时加载--查询企标属性类--查询到属性字段为：" + queryFieldBuss); + queryFieldNames = fieldInfoNameBuilder.toString(); + queryFieldNamesLaws = fieldInfoNameBuilderLaws.toString(); + queryFieldNamesBuss = fieldInfoNameBuilderBuss.toString(); + if (StringUtils.isNotBlank(queryFieldNames)) { + queryFieldNames = queryFieldNames.substring(0,queryFieldNames.length()-1); + } + if (StringUtils.isNotBlank(queryFieldNamesLaws)) { + queryFieldNamesLaws = queryFieldNamesLaws.substring(0,queryFieldNamesLaws.length()-1); + } + if (StringUtils.isNotBlank(queryFieldNamesBuss)) { + queryFieldNamesBuss = queryFieldNamesBuss.substring(0,queryFieldNamesBuss.length()-1); + } + } else { + logger.error("新增编辑时加载--查询标准属性类--未查询到属性字段数据！"); + } + InitStandAttrUtil.queryField = queryField; //所有属性表需要查询的字段以逗号分隔 + InitStandAttrUtil. queryFieldNames = queryFieldNames; //所有属性表需要查询的字段名以逗号分隔 + InitStandAttrUtil.queryFieldList = queryFieldList; //所有属性表需要查询的字段 + InitStandAttrUtil.selectionFieldList = selectionFieldList; // 属性表下拉选项类型字段 + InitStandAttrUtil.fileFieldList = fileFieldList; // 属性表文件类型字段 + InitStandAttrUtil.clobFieldList = clobFieldList; // 属性表clob类型字段 + InitStandAttrUtil.timeFieldList = timeFieldList; // 属性表日期类型字段 + InitStandAttrUtil.multiTimeFieldList = multiTimeFieldList; // 属性表日期类型字段 + InitStandAttrUtil.numFieldList = numFieldList; // 属性表数字类型字段 + InitStandAttrUtil.standInlandAttrFieldList = standInlandAttrFieldList; + InitStandAttrUtil.standForeignAttrFieldList = standForeignAttrFieldList; + InitStandAttrUtil.selectFieldMap = selectFieldMap; + // 政策属性字段信息 + InitStandAttrUtil.queryFieldLaws = queryFieldLaws; //所有属性表需要查询的字段以逗号分隔 + InitStandAttrUtil.queryFieldNamesLaws = queryFieldNamesLaws; //所有属性表需要查询的字段名以逗号分隔 + InitStandAttrUtil.queryFieldListLaws = queryFieldListLaws; //所有属性表需要查询的字段 + InitStandAttrUtil.selectionFieldListLaws = selectionFieldListLaws; // 属性表下拉选项类型字段 + InitStandAttrUtil.fileFieldListLaws = fileFieldListLaws; // 属性表文件类型字段 + InitStandAttrUtil.clobFieldListLaws = clobFieldListLaws; // 属性表clob类型字段 + InitStandAttrUtil.timeFieldListLaws = timeFieldListLaws; // 属性表日期类型字段 + InitStandAttrUtil.multiTimeFieldListLaws = multiTimeFieldListLaws; // 属性表日期类型字段 + InitStandAttrUtil.numFieldListLaws = numFieldListLaws; // 属性表数字类型字段 + InitStandAttrUtil.lawsInlandAttrFieldList = lawsInlandAttrFieldList; + InitStandAttrUtil.lawsForeignAttrFieldList = lawsForeignAttrFieldList; + InitStandAttrUtil.selectFieldMapLaws = selectFieldMapLaws; + // 企标属性字段信息 + InitStandAttrUtil.queryFieldBuss = queryFieldBuss; //所有属性表需要查询的字段以逗号分隔 + InitStandAttrUtil.queryFieldNamesBuss = queryFieldNamesBuss; //所有属性表需要查询的字段名以逗号分隔 + InitStandAttrUtil.queryFieldListBuss = queryFieldListBuss; //所有属性表需要查询的字段 + InitStandAttrUtil.selectionFieldListBuss = selectionFieldListBuss; // 属性表下拉选项类型字段 + InitStandAttrUtil.fileFieldListBuss = fileFieldListBuss; // 属性表文件类型字段 + InitStandAttrUtil.clobFieldListBuss = clobFieldListBuss; // 属性表clob类型字段 + InitStandAttrUtil.timeFieldListBuss = timeFieldListBuss; // 属性表日期类型字段 + InitStandAttrUtil.multiTimeFieldListBuss = multiTimeFieldListBuss; // 属性表日期类型字段 + InitStandAttrUtil.numFieldListBuss = numFieldListBuss; // 属性表数字类型字段 + InitStandAttrUtil.bussAttrFieldList = bussAttrFieldList; + InitStandAttrUtil.selectFieldMapBuss = selectFieldMapBuss; + } + + /*** + * @Description: 修改字段属性 + * @Author: yangxuenan + * @Date: 2020/8/18 9:19 + * @Param: [] + * @Return: void + */ + public String updateStandAttrDetails (SarStandAttrDetails sarStandAttrDetailsEO) { + // 查询修改数据原信息 + SarStandAttrDetails oldDetails = dao.selectById(sarStandAttrDetailsEO.getId()); + //验证属性名称是否已存在 + SarStandAttrDetailsEOPage detailsEOPage = new SarStandAttrDetailsEOPage(); + detailsEOPage.setNotId(sarStandAttrDetailsEO.getId()); + detailsEOPage.setAttrField(null); + detailsEOPage.setSarType(sarStandAttrDetailsEO.getSarType()); + detailsEOPage.setAttrName(sarStandAttrDetailsEO.getAttrName()); + int countName = dao.queryByCount(detailsEOPage); + if (countName > 0) { + return "属性名称已存在"; + } + // 修改属性表字段（当前仅允许修改长度） + Long oldLen = oldDetails.getAttrLen(); + Long newLen = sarStandAttrDetailsEO.getAttrLen(); + if (oldLen > newLen) { + return "修改字段长度不能小于原长度"; + } else if (oldLen < newLen) { + String fieldInfo = ""; + String attrType = sarStandAttrDetailsEO.getAttrType(); + String sarType = sarStandAttrDetailsEO.getSarType(); + String attrField = sarStandAttrDetailsEO.getAttrField(); +// if (StandAttrTypeEnum.INPUT_STR.getValue().equals(attrType) || StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) || StandAttrTypeEnum.SEL_OPTS.getValue().equals(attrType) || StandAttrTypeEnum.FILE.getValue().equals(attrType)) { +// fieldInfo = "(" + attrField + " VARCHAR2(" + String.valueOf(newLen) + " char))"; +// } else if (StandAttrTypeEnum.INPUT_NUM.getValue().equals(attrType)) { +// fieldInfo = "(" + attrField + " NUMBER(" + String.valueOf(newLen) + "))"; +// } else if (StandAttrTypeEnum.DATE_PICKER.getValue().equals(attrType)) { +// fieldInfo = "(" + attrField + " DATE)"; +// } else if (StandAttrTypeEnum.TEXTAREA.getValue().equals(attrType)) { +// fieldInfo = "(" + attrField + " CLOB(" + String.valueOf(newLen) + "))"; +// } +// if (standTypeList.contains(sarType)) { +// sarStandAttrInfoEOService.updateAttrLen(fieldInfo); +// } else if (lawsTypeList.contains(sarType)) { +// sarLawsAttrInfoEOService.updateAttrLen(fieldInfo); +// } else if (SarTypeEnum.BUSS.getValue().equals(sarType)) { +// sarBussStandAttrInfoEOService.updateAttrLen(fieldInfo); +// } + } + // 修改属性详细信息表 + sarStandAttrDetailsEO.setModifyTime(new Date()); + int countSuc = dao.updateById(sarStandAttrDetailsEO); + if (countSuc > 0) { + return "success"; + } else { + return "error"; + } + } + + /*** + * @Description: 删除字段属性 + * @Author: yangxuenan + * @Date: 2020/8/18 9:19 + * @Param: [ids] + * @Return: java.lang.String + */ + public String deleteByIds (String ids,String sarType) { + String resultMsg = ""; + //查询所有字段名 + String[] idArr = ids.split(","); + SarStandAttrDetailsEOPage page = new SarStandAttrDetailsEOPage(); + page.setIdList(idArr); + List getList = dao.queryByList(page); + if (getList != null && !getList.isEmpty()) { + String columnNames = ""; + for (SarStandAttrDetails detailsEO : getList) { + columnNames += detailsEO.getAttrField() + ","; + } + columnNames = " " + columnNames.substring(0,columnNames.length()-1) + " "; + //删除属性表字段 sarLawsAttrInfoDao.alterLawsAttr(fieldInfo); + if (standTypeList.contains(sarType)) { + sarStandAttrInfoEODao.deleteStandAttr(columnNames); + } else if (lawsTypeList.contains(sarType)) { + sarLawsAttrInfoDao.deleteLawsAttr(columnNames); + } else if (SarTypeEnum.BUSS.getValue().equals(sarType)) { +// sarBussStandAttrInfoEOService.deleteStandAttr(columnNames); + } + } + //删除属性信息详情表数据 + List idList = Arrays.asList(idArr); + int countSuc = dao.deleteBatchIds(idList); + if (countSuc > 0) { + return "success"; + } else { + return "error"; + } + } + + public List selectFileFieldForSel(String attrField){ + return dao.selectFileFieldForSel(attrField); + } + public List selectFileFieldForSel1(String attrField){ + return dao.selectFileFieldForSel1(attrField); + } + + } 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 46e74505..1745781a 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 @@ -2,6 +2,8 @@ package com.adc.da.slrs.sarStandAttrInfo.entity; import com.adc.da.base.entity.BaseEntity; import java.time.LocalDateTime; +import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -42,33 +44,40 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField("CREATION_TIME") - private LocalDateTime creationTime; + private Date creationTime; @ApiModelProperty(value = "修改时间") @TableField("MODIFY_TIME") - private LocalDateTime modifyTime; + private Date modifyTime; + @ApiModelProperty(value = "归口管理部门") @TableField("GKDW") private String gkdw; + @ApiModelProperty(value = "起草单位") @TableField("FBJG") private String fbjg; + @ApiModelProperty(value = "我司参与深度") @TableField("CYSD") private String cysd; + @ApiModelProperty(value = "新车型实施日期(标准文本）") @TableField("XCXSSRQ") private String xcxssrq; + @ApiModelProperty(value = "在产车实施日期(标准文本）") @TableField("ZCCSSRQ") private String zccssrq; @TableField("EOPSSRQ") private String eopssrq; + @ApiModelProperty(value = "采标编号") @TableField("CBBH") private String cbbh; + @ApiModelProperty(value = "适用车辆") @TableField("CLLX") private String cllx; @@ -93,45 +102,56 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("SVPPS") private String svpps; + @ApiModelProperty(value = "草案") @TableField("CA") private String ca; + @ApiModelProperty(value = "征求意见稿") @TableField("ZQYJG") private String zqyjg; + @ApiModelProperty(value = "送审稿") @TableField("SSG") private String ssg; + @ApiModelProperty(value = "报批稿") @TableField("BPG") private String bpg; @TableField("CGBM") private String cgbm; + @ApiModelProperty(value = "发布稿") @TableField("FBGBJBD") private String fbgbjbd; @TableField("ZBJBD") private String zbjbd; + @ApiModelProperty(value = "责任部门") @TableField("ZRBM") private String zrbm; @TableField("FGWHR") private String fgwhr; + @ApiModelProperty(value = "代替标准编号") @TableField("DTBJH") private String dtbjh; + @ApiModelProperty(value = "引用标准") @TableField("YYBJ") private String yybj; + @ApiModelProperty(value = "被引用标准") @TableField("BYYBJ") private String byybj; + @ApiModelProperty(value = "相关流程") @TableField("XGLC") private String xglc; + @ApiModelProperty(value = "参会记录") @TableField("CHJL") private String chjl; @@ -144,6 +164,7 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("EOPSSRQXM") private String eopssrqxm; + @ApiModelProperty(value = "采标程度") @TableField("CBCD") private String cbcd; @@ -168,5 +189,81 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("BDTBZBH") private String bdtbzbh; + // 新添加字段 --start + + @ApiModelProperty(value = "新车型实施日期(国际）") + @TableField("XCXSSRQGJ") + private String xcxssrqgj; + + @ApiModelProperty(value = "在产车实施日期(国际）") + @TableField("ZCCSSRQGJ") + private String zccssrqgj; + + @ApiModelProperty(value = "实施日期(标准文本）") + @TableField("SSRQ") + private String ssrq; + + @ApiModelProperty(value = "实施日期(国际）") + @TableField("SSRQGJ") + private String ssrqgj; + + @ApiModelProperty(value = "修改单") + @TableField("XGD") + private String xgd; + + @ApiModelProperty(value = "解读文件") + @TableField("JDWJ") + private String jdwj; + + @ApiModelProperty(value = "我司署名人") + @TableField("WSSMR") + private String wssmr; + + @ApiModelProperty(value = "能源类型") + @TableField("NYLX") + private String nylx; + + @ApiModelProperty(value = "适用产品线") + @TableField("SYCPX") + private String sycpx; + + @ApiModelProperty(value = "适用认证") + @TableField("SYRZ") + private String syrz; + + @ApiModelProperty(value = "责任工程师") + @TableField("ZRGCS") + private String zrgcs; + + @ApiModelProperty(value = "乘用车VPPS编码") + @TableField("CYCVPPSBM") + private String cycvppsbm; + + @ApiModelProperty(value = "乘用车VPPS中文名称") + @TableField("CYCVPPSCN") + private String cycvppscn; + + @ApiModelProperty(value = "卡车VPPS编码") + @TableField("KCCVPPSBM") + private String kccvppsbm; + + @ApiModelProperty(value = "卡车VPPS中文名称") + @TableField("KCCVPPSCN") + private String kccvppscn; + + @ApiModelProperty(value = "模块结构单元变型号") + @TableField("DYBXH") + private String dybxh; + + @ApiModelProperty(value = "模块结构单元名称") + @TableField("DYMC") + private String dymc; + + @ApiModelProperty(value = "关联文件") + @TableField("GLWJ") + private String glwj; + + // -- end + } 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 new file mode 100644 index 00000000..1535b10a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -0,0 +1,41 @@ +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.service.impl.SarStandProjectLibraryServiceImpl; +import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.baomidou.mybatisplus.core.metadata.IPage; +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 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; + +/** +*

+ * 前端控制器 + *

+* +* @author ZhangJin +* @since 2021-06-15 +*/ +@RestController +@Api(description = "|SarStandProjectLibrary|") +@RequestMapping("/sarStandProjectLibrary/sar-stand-project-library") +public class SarStandProjectLibraryController extends BaseController { + @Resource + private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService; + @GetMapping("/queryMaintenanceProject") + @ApiOperation("项目查询") + public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", value = "newStandPage")int Page, @RequestParam(defaultValue = "10", value = "newStandPageSize") int PageSize) { + IPage list = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize); + return Result.success("200",list); + } + +} 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 new file mode 100644 index 00000000..fae67684 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarStandProjectLibrary.dao; + +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author ZhangJin + * @since 2021-06-15 + */ +public interface SarStandProjectLibraryDao extends BaseMapper { + +} 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 new file mode 100644 index 00000000..e8843c2d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author ZhangJin + * @since 2021-06-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarStandProjectLibrary对象", description="") +public class SarStandProjectLibrary extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "产品平台") + private String projectPlatfor; + + @ApiModelProperty(value = "项目编号") + private String projectNumber; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "项目分类") + private String projectClassification; + + @ApiModelProperty(value = "项目状态") + private String projectStatus; + + @ApiModelProperty(value = "项目群") + private String projectGroup; + + @ApiModelProperty(value = "项目开始日期") + private Date projectStartDate; + + @ApiModelProperty(value = "项目完成日期") + private Date projectEndDate; + + @ApiModelProperty(value = "当前节点") + private String currentNode; + + @ApiModelProperty(value = "项目级别") + private String projectLevel; + + private String projectManager; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/ISarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/ISarStandProjectLibraryService.java new file mode 100644 index 00000000..10f24e5f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/ISarStandProjectLibraryService.java @@ -0,0 +1,18 @@ +package com.adc.da.slrs.sarStandProjectLibrary.service; + +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-06-02 + */ +public interface ISarStandProjectLibraryService extends IService { + + IPage queryMaintenanceProject(int current, int pageSize); +} 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 new file mode 100644 index 00000000..a55444bc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -0,0 +1,37 @@ +package com.adc.da.slrs.sarStandProjectLibrary.service.impl; + +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; +import com.adc.da.slrs.sarStandProjectLibrary.service.ISarStandProjectLibraryService; +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; + +/** + *

+ * 服务实现类 + *

+ * + * @author ZhangJin + * @since 2021-06-15 + */ +@Service +public class SarStandProjectLibraryServiceImpl extends ServiceImpl implements ISarStandProjectLibraryService { + + @Autowired + private SarStandProjectLibraryDao sarStandProjectLibraryDao; + + @Override + public IPage queryMaintenanceProject(int current,int pageSize) { + QueryWrapper wrapper= new QueryWrapper<>(); + wrapper.inSql("id", "select project_id from sar_stand_project_relation"); + Page page = new Page<>(current, pageSize); + IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); + System.out.println("总条数"+userIPage.getTotal()); + System.out.println("总页数"+userIPage.getPages()); + return userIPage; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java new file mode 100644 index 00000000..87b321e4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.sarStandUnqualified.controller; + + +import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 前端控制器 + *

+* +* @author super_liu +* @since 2021-06-15 +*/ +@RestController +@Api(tags = "未符合项整改") +@RequestMapping("/sarStandUnqualified/sar-stand-unqualified") +public class SarStandUnqualifiedController extends BaseController { + @Autowired + private ISarStandUnqualifiedService sarStandUnqualifiedService; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java new file mode 100644 index 00000000..d91792c6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarStandUnqualified.dao; + +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-06-15 + */ +public interface SarStandUnqualifiedDao extends BaseMapper { + +} 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 new file mode 100644 index 00000000..d0ea4bc6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -0,0 +1,102 @@ +package com.adc.da.slrs.sarStandUnqualified.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; +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; + +/** + *

+ * + *

+ * + * @author super_liu + * @since 2021-06-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarStandUnqualified对象", description="") +public class SarStandUnqualified extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "创建部门") + @TableField("CREATE_DEPT_ID") + private String createDeptId; + + @ApiModelProperty(value = "创建人") + @TableField("CREATE_BY_ID") + private String createById; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATE_TIME") + private LocalDateTime createTime; + + @ApiModelProperty(value = "关闭状态（1为开启，2为关闭）") + @TableField("CLOSE_STATE") + private Integer closeState; + + @ApiModelProperty(value = "实际关闭时间") + @TableField("ACTUAL_CLOSE_TIME") + private LocalDateTime actualCloseTime; + + @ApiModelProperty(value = "计划关闭时间") + @TableField("PLAN_CLOSE_TIME") + private LocalDateTime planCloseTime; + + @ApiModelProperty(value = "质量工程师") + @TableField("QA_ENGINEER") + private String qaEngineer; + + @ApiModelProperty(value = "认证工程师") + @TableField("AUTH_ENGINEER") + private String authEngineer; + + @ApiModelProperty(value = "责任工程师") + @TableField("DUTY_ENGINEER") + private String dutyEngineer; + + @ApiModelProperty(value = "责任部门") + @TableField("RESPONSIBLE_UNIT") + private String responsibleUnit; + + @ApiModelProperty(value = "项目名称") + @TableField("PRODUCT_NAME") + private String productName; + + @ApiModelProperty(value = "产品线") + @TableField("PRODUCT_LINE") + private String productLine; + + @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") + @TableField("PRODUCT_TYPE") + private String productType; + + @ApiModelProperty(value = "条款名称") + @TableField("ITEMS_NAME") + private String itemsName; + + @ApiModelProperty(value = "条款号") + @TableField("ITEMS_NUM") + private String itemsNum; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "标准ID") + @TableField("STAND_ID") + private String standId; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java new file mode 100644 index 00000000..765bc8bc --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.sarStandUnqualified.service; + +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author super_liu + * @since 2021-06-15 + */ +public interface ISarStandUnqualifiedService extends IService { + +} 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 new file mode 100644 index 00000000..66d459c9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarStandUnqualified.service.impl; + +import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; +import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao; +import com.adc.da.slrs.sarStandUnqualified.service.ISarStandUnqualifiedService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author super_liu + * @since 2021-06-15 + */ +@Service +public class SarStandUnqualifiedServiceImpl extends ServiceImpl implements ISarStandUnqualifiedService { + +} 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 950470bf..22b70ee3 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 @@ -27,7 +27,21 @@ import java.util.Map; public class EarlyWarningEOController extends BaseController { @Resource private EarlyWarningEOServiceImpl earlyWarningEOService; - +/** +* + * @param newStandPage + * @param newStandPageSize + * @param oldStandPage + * @param oldStandPageSize + * @param newItemsPage + * @param newItemsPageSize + * @param oldItemsPage + * @param oldItemsPageSize + * @param applyType +* @return +* @author zj +* date 2021-06-15 +**/ @GetMapping("/StandWarning") @ApiOperation("标准预警查询") public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, @@ -50,14 +64,29 @@ public class EarlyWarningEOController extends BaseController { listMap .add(map); return Result.success("200",listMap); } - + /** + * + * @param id + * @return + * @author zj + * date 2021-06-15 + **/ @GetMapping("/ChangePermissions") @ApiOperation("更改权限") public ResponseMessage ChangePermissions(String id) { String power = earlyWarningEOService.ChangePermissions(id); return Result.success("200",power); } - + /** + * + * @param newPolicyPage + * @param newPolicyPageSize + * @param oldPolicyPage + * @param oldPolicyPageSize + * @return + * @author zj + * date 2021-06-15 + **/ @GetMapping("/PolicyWarning") @ApiOperation("政策预警查询") public ResponseMessage newPolicyPageInfo(@RequestParam(defaultValue = "1", value = "newPolicyPage")int newPolicyPage, @RequestParam(defaultValue = "10", value = "newPolicyPageSize") int newPolicyPageSize, 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 26fa5ffe..eda60342 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 @@ -73,7 +73,7 @@ public class SarStandardsInfo extends BaseEntity { @TableField("STAND_NATURE") private String standNature; - @ApiModelProperty(value = "发布日期") + @ApiModelProperty(value = "标准发布日期") @TableField("ISSUE_TIME") private String issueTime; @@ -111,10 +111,11 @@ public class SarStandardsInfo extends BaseEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date modifyTime; - @ApiModelProperty(value = "是否法规清单相关(0否 1是)") + @ApiModelProperty(value = "是否纳入认证清单(0否 1是)") @TableField("IS_RELATE_ACCESS") private String isRelateAccess; + @ApiModelProperty(value = "引用标准") @TableField("CITE_STAND") private String citeStand; @@ -123,6 +124,15 @@ public class SarStandardsInfo extends BaseEntity { @TableField("CITED_STAND") private String citedStand; + // 新添加字段 + @ApiModelProperty(value = "文本状态") + @TableField("TEXT_STATUS") + private String textStatus; + + @ApiModelProperty(value = "标准体系") + @TableField("STAND_SYSTEM") + private String standSystem; + // 以下为非表中字段 @TableField(exist = false) @@ -164,8 +174,6 @@ public class SarStandardsInfo extends BaseEntity { private String accessCountry;//纳入清单的国家 @TableField(exist = false) private String processNum;//流程编号 - @TableField(exist = false) - private String textStatus;//文本状态 // 在库里的标准节点类型（工作组） @TableField(exist = false) private String menuType; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/adc-da-slrs/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/adc-da-slrs/SarStandUnqualifiedMapper.xml new file mode 100644 index 00000000..f8a704c8 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/adc-da-slrs/SarStandUnqualifiedMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrInfo/SarLawsAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrInfo/SarLawsAttrInfoMapper.xml index 59aac977..07a34f60 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrInfo/SarLawsAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrInfo/SarLawsAttrInfoMapper.xml @@ -54,10 +54,164 @@ + + + + insert into SAR_LAWS_ATTR_INFO() + values (#{id, jdbcType=VARCHAR}, #{lawsId, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) + + + + + + insert into SAR_LAWS_ATTR_INFO + + id, + laws_id, + creation_user, + valid_flag, + creation_time, + modify_time, + + + #{id, jdbcType=VARCHAR}, + #{lawsId, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=VARCHAR}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + + + + + + update SAR_LAWS_ATTR_INFO + set laws_id = #{lawsId}, + creation_user = #{creationUser}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime} + where id = #{id} + + + + + update SAR_LAWS_ATTR_INFO + + + laws_id = #{lawsId}, + + + creation_user = #{creationUser}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + where id = #{id} + + + + + + + + delete from SAR_LAWS_ATTR_INFO + where id = #{value} + + + + + + + + + + + + + alter table SAR_LAWS_ATTR_INFO + add ${fieldInfo} + + + + + alter table SAR_LAWS_ATTR_INFO + drop COLUMN ${fieldInfo} + + + + + + + + ALTER table SAR_LAWS_ATTR_INFO + MODIFY ${fieldInfo} + + + + + insert into SAR_LAWS_ATTR_INFO(${fieldInfo}) + values (${fieldValue}) + + + + delete from SAR_LAWS_ATTR_INFO + where laws_id = #{standId} + + + + update SAR_LAWS_ATTR_INFO set ${field}=#{value} + where laws_id = #{lawsId} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInfo/SarLawsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInfo/SarLawsInfoMapper.xml index 0644267c..a3820e1e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInfo/SarLawsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsInfo/SarLawsInfoMapper.xml @@ -284,4 +284,11 @@ GROUP BY SAR_LAWS_INFO.ID) a + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandAttrDetails/SarStandAttrDetailsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandAttrDetails/SarStandAttrDetailsMapper.xml index 5a83b7d3..64224457 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandAttrDetails/SarStandAttrDetailsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandAttrDetails/SarStandAttrDetailsMapper.xml @@ -107,20 +107,57 @@ - + select from SAR_STAND_ATTR_DETAILS - where attr_field = #{attrField} and valid_flag=0 - - and (sar_type=#{sarType} or sar_type='STAND') - - - and (sar_type=#{sarType} or sar_type='STAND') - - - and sar_type=#{sarType} - - limit 0,1 + where id = #{value} and valid_flag=0 + + + + + + delete from SAR_STAND_ATTR_DETAILS + where id = #{value} and valid_flag=0 + + + + + + + + + + + + + delete from SAR_STAND_ATTR_DETAILS + where id in + + #{item} + + + + + + + + + + + + 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 new file mode 100644 index 00000000..d5caed43 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 new file mode 100644 index 00000000..b90da545 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 757649d4..e725b2f7 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 @@ -28,6 +28,8 @@ + + @@ -50,7 +52,7 @@ SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, SAR_STANDARDS_INFO.synopsis, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, - SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,SAR_STANDARDS_INFO.is_relate_access,SAR_STANDARDS_INFO.cite_stand,SAR_STANDARDS_INFO.cited_stand + SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,SAR_STANDARDS_INFO.is_relate_access,SAR_STANDARDS_INFO.cite_stand,SAR_STANDARDS_INFO.cited_stand,SAR_STANDARDS_INFO.text_status @@ -59,7 +61,7 @@ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow, - dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand + dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status @@ -68,7 +70,7 @@ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME, - dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand + dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status @@ -159,6 +161,12 @@ and is_relate_access = #{isRelateAccess} + + and text_status = #{textStatus} + + + and stand_system = #{standSystem} + @@ -188,6 +196,8 @@ is_relate_access, cite_stand, cited_stand, + text_status, + stand_system, #{id, jdbcType=VARCHAR}, @@ -212,6 +222,8 @@ #{isRelateAccess, jdbcType=VARCHAR}, #{citeStand, jdbcType=VARCHAR}, #{citedStand, jdbcType=VARCHAR}, + #{textStatus, jdbcType=VARCHAR}, + #{standSystem, jdbcType=VARCHAR}, @@ -235,7 +247,9 @@ creation_user = #{creationUser}, valid_flag = #{validFlag}, creation_time = #{creationTime}, - modify_time = #{modifyTime} + modify_time = #{modifyTime}, + text_status = #{textStatus}, + stand_system = #{standSystem} where id = #{id} @@ -306,6 +320,12 @@ cited_stand = #{citedStand}, + + text_status = #{textStatus}, + + + stand_system = #{standSystem}, + where id = #{id} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java index 22ae3d80..73946868 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicEORestController.java @@ -24,7 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/${restPath}/sys/dictionary") -@Api(description = "数据字典管理") +@Api(tags = "数据字典管理") public class DicEORestController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(DictionaryEO.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java index 6a9a6602..9df03f62 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java @@ -27,7 +27,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/sys/dictype") -@Api(description = "字典类型明细管理") +@Api(tags = "字典类型明细管理") public class DicTypeEORestController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(DicTypeEO.class); @Autowired diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/FeedbackInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/FeedbackInfoEOController.java index c8c33204..ec82b26d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/FeedbackInfoEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/FeedbackInfoEOController.java @@ -27,7 +27,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/sys/feedbackInfo") -@Api(description = "|FeedbackInfoEO|") +@Api(tags = "|FeedbackInfoEO|") public class FeedbackInfoEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(FeedbackInfoEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/LinkInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LinkInfoEOController.java index 67ec504c..243d4f8d 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/LinkInfoEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LinkInfoEOController.java @@ -23,7 +23,7 @@ import java.util.List; @RestController @RequestMapping("/${restPath}/sys/linkInfo") -@Api(description = "|LinkInfoEO|") +@Api(tags = "|LinkInfoEO|") public class LinkInfoEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(LinkInfoEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/LoginInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LoginInfoEOController.java index 62686b53..79f7bf10 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/LoginInfoEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/LoginInfoEOController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; * @Description: */ @RestController -@Api(description="LoginInfoEO") +@Api(tags="LoginInfoEO") @RequestMapping("/${restPath}/sys/loginInfoEO") public class LoginInfoEOController { @Autowired diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java index f0ba2844..615ae981 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java @@ -24,7 +24,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/sys/menu") -@Api(description = "菜单管理") +@Api(tags = "菜单管理") public class MenuEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(MenuEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java index 5f1a731f..74ed1549 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleEOController.java @@ -38,7 +38,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/sys/role") -@Api(description = "角色管理") +@Api(tags = "角色管理") public class RoleEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(RoleEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleSarMenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleSarMenuEOController.java index 490569dd..08722b23 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleSarMenuEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/RoleSarMenuEOController.java @@ -21,7 +21,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/sys/roleSarMenu") -@Api(description = "|RoleSarMenuEO|") +@Api(tags = "|RoleSarMenuEO|") public class RoleSarMenuEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(RoleSarMenuEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserConfigEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserConfigEOController.java index b2f155c2..93870d3f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserConfigEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserConfigEOController.java @@ -21,7 +21,7 @@ import java.util.List; @RestController @RequestMapping("/${restPath}/person/userConfig") -@Api(description = "|UserConfigEO|") +@Api(tags = "|UserConfigEO|") public class UserConfigEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(UserConfigEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index 50b89956..6d0eb4d0 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -35,7 +35,7 @@ import java.util.List; @RestController @RequestMapping("/${restPath}/sys/user") -@Api(description = "用户管理") +@Api(tags = "用户管理") public class UserEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(UserEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java index d4aeb11c..922c0abd 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserInfoEOController.java @@ -27,7 +27,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/person/userInfo") -@Api(description = "|UserInfoEO|") +@Api(tags = "|UserInfoEO|") public class UserInfoEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(UserInfoEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/WarnTimeEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/WarnTimeEOController.java index 2bd7b1e2..ebcb43d0 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/WarnTimeEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/WarnTimeEOController.java @@ -24,7 +24,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @RestController @RequestMapping("/${restPath}/sys/warnTime") -@Api(description = "|WarnTimeEO|") +@Api(tags = "|WarnTimeEO|") public class WarnTimeEOController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(WarnTimeEOController.class); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/page/DictionaryEOPage.java b/adc-da-sys/src/main/java/com/adc/da/sys/page/DictionaryEOPage.java index d6bb4b30..094373c8 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/page/DictionaryEOPage.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/page/DictionaryEOPage.java @@ -2,6 +2,7 @@ package com.adc.da.sys.page; import com.adc.da.base.page.BasePage; +import lombok.Data; /** * 功能：TS_DICTIONARY DictionaryEOPage
@@ -9,6 +10,7 @@ import com.adc.da.base.page.BasePage; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ +@Data public class DictionaryEOPage extends BasePage { private String modifyTime; @@ -31,155 +33,8 @@ public class DictionaryEOPage extends BasePage { private String idOperator = "="; private String notId; - public String getModifyTime() { - return this.modifyTime; - } + private String paixu; + private String shunxu; + private String sql; - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getDictionarySeq() { - return this.dictionarySeq; - } - - public void setDictionarySeq(String dictionarySeq) { - this.dictionarySeq = dictionarySeq; - } - - public String getDictionarySeqOperator() { - return this.dictionarySeqOperator; - } - - public void setDictionarySeqOperator(String dictionarySeqOperator) { - this.dictionarySeqOperator = dictionarySeqOperator; - } - - public String getDictionaryName() { - return this.dictionaryName; - } - - public void setDictionaryName(String dictionaryName) { - this.dictionaryName = dictionaryName; - } - - public String getDictionaryNameOperator() { - return this.dictionaryNameOperator; - } - - public void setDictionaryNameOperator(String dictionaryNameOperator) { - this.dictionaryNameOperator = dictionaryNameOperator; - } - - public String getDictionaryCode() { - return this.dictionaryCode; - } - - public void setDictionaryCode(String dictionaryCode) { - this.dictionaryCode = dictionaryCode; - } - - public String getDictionaryCodeOperator() { - return this.dictionaryCodeOperator; - } - - public void setDictionaryCodeOperator(String dictionaryCodeOperator) { - this.dictionaryCodeOperator = dictionaryCodeOperator; - } - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getNotId() { - return notId; - } - - public void setNotId(String notId) { - this.notId = notId; - } }