From 543e33753329b73df3f413c13a3895c6f772357e Mon Sep 17 00:00:00 2001 From: 79493 <794930212@qq.com> Date: Fri, 16 Dec 2022 11:56:22 +0800 Subject: [PATCH] =?UTF-8?q?EasyExcel=20=E8=A1=8C=E4=B8=9A=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=20=E5=8F=8A=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20EasyExcel=20=E4=BC=81=E4=B8=9A=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=2030%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rzyc/mapper/ent/BaseInClassMapper.java | 2 + .../com/rzyc/mapper/ent/InEntListMapper.java | 9 +++ .../com/rzyc/mapper/ent/InListItemMapper.java | 9 +-- .../com/rzyc/mapper/ent/InListMapper.java | 2 +- .../model/EasyExcel/EasyExcelEnterprise.java | 35 +++++++++++ .../rzyc/model/EasyExcel/EasyExcelInList.java | 8 +++ .../java/com/rzyc/model/dto/InListAddDto.java | 12 +++- .../com/rzyc/model/dto/InListItemDto.java | 40 ++++++------ .../mapper/ent/BaseInClassMapper.xml | 9 ++- .../resources/mapper/ent/InEntListMapper.xml | 18 ++++++ .../resources/mapper/ent/InListItemMapper.xml | 22 ++++++- .../resources/mapper/ent/InListMapper.xml | 11 +++- .../com/rzyc/controller/UploadController.java | 17 ++++- .../com/rzyc/service/PcBusinessService.java | 6 ++ .../rzyc/utils/easyexcel/InListListener.java | 24 ++++--- .../com/rzyc/utils/easyexcel/ReadTest.java | 30 --------- .../com/rzyc/controller/BaseController.java | 22 +++++++ .../controller/IndustryListController.java | 63 ++++++------------- .../rzyc/controller/MinWorkController.java | 3 +- .../rzyc/controller/PcPersonalController.java | 2 +- .../controller/ent/PcCompanyController.java | 5 +- .../java/com/rzyc/utils/ObjectConversion.java | 38 +++++++++++ .../src/main/resources/application.yml | 2 +- 23 files changed, 268 insertions(+), 121 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelEnterprise.java create mode 100644 inventory-gov/src/main/java/com/rzyc/utils/ObjectConversion.java diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java index 9876c5c..7e6a936 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/BaseInClassMapper.java @@ -65,4 +65,6 @@ public interface BaseInClassMapper { /*最小工作单元行业*/ List workIndustry(); + + BaseInClass selectBaseInClassByName(@Param("industryClassName") String industryClassName); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java index 53205dc..317be5a 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InEntListMapper.java @@ -2,6 +2,7 @@ package com.rzyc.mapper.ent; import com.rzyc.model.ent.InEntList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rzyc.model.ent.InListItem; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -25,4 +26,12 @@ public interface InEntListMapper extends BaseMapper { * */ List selectByEnterpriseId(@Param("enterpriseId") String enterpriseId); + + /** + * 插入清单项到企业清单项表 + * @param inListItems 行业清单项 + * @return int + * */ + int insertList(@Param("list")ListinListItems); + } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java index 2addc70..6fb9320 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java @@ -19,14 +19,15 @@ import java.util.List; @Repository public interface InListItemMapper extends BaseMapper { - List SelectContents(); + List SelectContents(@Param("industryId") String industryId,@Param("listId")String listId); /*通过行业查询清单信息*/ List findByIndustryId(@Param("industryId") String industryId); /** - * - * + *导入清单项 + * @param list + * @return int * */ - int insertItem(ListeasyExcelInLists); + int insertItem(@Param("list") Listlist); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java index 1640f45..6890c81 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java @@ -19,7 +19,7 @@ import java.util.List; @Repository public interface InListMapper extends BaseMapper { /*查询所有*/ - List findAll(); + List findAll(String industry); /** diff --git a/inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelEnterprise.java b/inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelEnterprise.java new file mode 100644 index 0000000..f3e8d64 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelEnterprise.java @@ -0,0 +1,35 @@ +package com.rzyc.model.EasyExcel; + + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@EqualsAndHashCode +/** + * EasyExcel导入企业 + * @author Xuwanxin + * @date 2022/12/16 + * */ +public class EasyExcelEnterprise { + + private String address; + + private String industry; + + private String legalPerson; + + private String legalPersonPhone; + + private String safeChangePerson; + + private String safeChangePersonPhone; + + private Integer staffNumber; + + private String dateOfIncorporation; + + private String businessScope; +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelInList.java b/inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelInList.java index 98e1a3d..4d070dc 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelInList.java +++ b/inventory-dao/src/main/java/com/rzyc/model/EasyExcel/EasyExcelInList.java @@ -8,6 +8,11 @@ import lombok.Setter; @Getter @Setter @EqualsAndHashCode +/** + * EasyExcel导入行业清单 + * @author Xuwanxin + * @date 2022/12/15 + * */ public class EasyExcelInList { private String industry; private String listName; @@ -16,6 +21,9 @@ public class EasyExcelInList { private Integer standard; private Integer frequency; private String remark; + private Integer sortId; + private String industryId; private String listId; + private String itemId; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InListAddDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InListAddDto.java index 491aa0c..514a16e 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/dto/InListAddDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InListAddDto.java @@ -16,10 +16,20 @@ public class InListAddDto { @TableId("name") private String name; + @ApiModelProperty(value = "行业id") + private String industryId; + @ApiModelProperty(value = "清单排序") - @TableId("sort_id") private Integer sortId; + public String getIndustryId() { + return industryId; + } + + public void setIndustryId(String industryId) { + this.industryId = industryId; + } + public String getName() { return name; } diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemDto.java index 35b53b6..8074525 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemDto.java +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemDto.java @@ -5,46 +5,46 @@ import io.swagger.annotations.ApiModelProperty; public class InListItemDto { @ApiModelProperty(value = "清单项id") - private String item_id; + private String itemId; @ApiModelProperty(value = "行业清单id") - private String list_id; + private String listId; @ApiModelProperty(value = "行业id") - private String industry_id; + private String industryId; @ApiModelProperty(value = "清单内容") - private String item_content; + private String itemContent; - public String getItem_content() { - return item_content; + public String getItemContent() { + return itemContent; } - public void setItem_content(String item_content) { - this.item_content = item_content; + public void setItemContent(String itemContent) { + this.itemContent = itemContent; } - public String getItem_id() { - return item_id; + public String getItemId() { + return itemId; } - public void setItem_id(String item_id) { - this.item_id = item_id; + public void setItemId(String itemId) { + this.itemId = itemId; } - public String getList_id() { - return list_id; + public String getListId() { + return listId; } - public void setList_id(String list_id) { - this.list_id = list_id; + public void setListId(String listId) { + this.listId = listId; } - public String getIndustry_id() { - return industry_id; + public String getIndustryId() { + return industryId; } - public void setIndustry_id(String industry_id) { - this.industry_id = industry_id; + public void setIndustryId(String industryId) { + this.industryId = industryId; } } diff --git a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml index 7c10a1f..a6e3ed4 100644 --- a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml @@ -360,7 +360,7 @@ + + + diff --git a/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml index b0b3774..ba10d26 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InEntListMapper.xml @@ -30,8 +30,26 @@ item_basis, item_proof, item_law, sort_id,del_state, create_time, create_by, modify_time, modify_by + + + insert into in_ent_list (ent_list_id,item_id,list_id,item_title,item_content,standard,frequency,sort_id,del_state,create_time,create_by,enterprise_id)values + + (#{list.entListId}, + #{list.itemId}, + #{list.listId}, + #{list.itemTitle}, + #{list.itemContent}, + #{list.standard}, + #{list.frequency}, + #{list.sortId}, + 1, + #{list.createTime}, + #{list.createBy}, + #{list.enterpriseId}) + + diff --git a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml index 8aa6f2b..60586da 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml @@ -30,11 +30,29 @@ item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, mod - + insert into in_list_item (item_id,list_id,industry_id, item_title,item_content,standard,frequency, del_state,sort_id)values + + (#{list.itemId}, + #{list.listId}, + #{list.industryId}, + #{list.listItem}, + #{list.listContent}, + #{list.standard}, + #{list.frequency}, + 1, + #{list.sortId}) + diff --git a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml index fdda2e9..a4c742a 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml @@ -22,18 +22,23 @@ - insert into in_list (list_id, name, del_state, create_by,create_time,industry_id)values + insert into in_list (list_id, name, del_state, create_by,create_time,industry_id,sort_id)values (#{list.listId}, #{list.name}, 1, #{list.createBy}, #{list.createTime}, - #{list.industryId}) + #{list.industryId}, + #{list.sortId}) diff --git a/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java b/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java index ed3dca8..9e4e40c 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java +++ b/inventory-ent/src/main/java/com/rzyc/controller/UploadController.java @@ -306,11 +306,11 @@ public class UploadController extends com.rzyc.controller.BaseController { /** - * EasyExcel读取 + * EasyExcel读取行业清单 * @return * @throws Exception */ - @ApiOperation(value = "EasyExcel读取", notes = "EasyExcel读取") + @ApiOperation(value = "EasyExcel读取行业清单", notes = "EasyExcel读取行业清单") @ResponseBody @RequestMapping(value = "/readEasyExcel", method = RequestMethod.GET) public String readEasyExcel(MultipartFile file)throws Exception{ @@ -318,6 +318,19 @@ public class UploadController extends com.rzyc.controller.BaseController { return "success"; } + /** + * EasyExcel读取企业 + * @return + * @throws Exception + */ + @ApiOperation(value = "EasyExcel读取企业", notes = "EasyExcel读取企业") + @ResponseBody + @RequestMapping(value = "/readEasyExcelOfEnterprise", method = RequestMethod.GET) + public String readEasyExcelOfEnterprise(MultipartFile file)throws Exception{ + pcBusinessService.readEasyExcelOfEnterprise(file); + return "success"; + } + diff --git a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java index 967aaf3..401e837 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java @@ -1202,4 +1202,10 @@ public class PcBusinessService extends BaseController { return singleResult; } + public SingleResult readEasyExcelOfEnterprise(MultipartFile file)throws IOException{ + SingleResult singleResult = new SingleResult(); + EasyExcel.read(file.getInputStream(), EasyExcelInList.class, new InListListener(inListMapper,inListItemMapper,baseInClassMapper)).doReadAll(); + return singleResult; + } + } diff --git a/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/InListListener.java b/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/InListListener.java index 03aaac2..29f460b 100644 --- a/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/InListListener.java +++ b/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/InListListener.java @@ -45,6 +45,8 @@ public class InListListener implements ReadListener { private String industryId = null; + private Integer listSort = 1; + private InListMapper inListMapper; private InListItemMapper inListItemMapper; @@ -66,19 +68,26 @@ public class InListListener implements ReadListener { @Override public void invoke(EasyExcelInList data, AnalysisContext context) { log.info("解析到一条数据:{}", JSON.toJSONString(data)); - if (data.getListName() != null){ - BaseInClass base = baseInClassMapper.selectByName(data.getListName()); - industryId = base.getBaseinclassid(); + BaseInClass base = null; + if (null == data.getIndustry()) { + + }else { + base = baseInClassMapper.selectBaseInClassByName(data.getIndustry()); + industryId = base.getBaseinclassid(); + } listName = data.getListName(); InList inList = new InList(); inList.setName(data.getListName()); listId = RandomNumber.getUUid(); - inList.setListId(RandomNumber.getUUid()); - inList.setIndustryId(base.getBaseinclassid()); + inList.setListId(listId); + inList.setIndustryId(industryId); inList.setCreateBy("系统导入"); inList.setCreateTime(new Date()); + + inList.setSortId(listSort); queryList.add(inList); + listSort++; } if (data.getIndustry() != null){ industry = data.getIndustry(); @@ -87,6 +96,7 @@ public class InListListener implements ReadListener { data.setIndustry(industry); data.setListId(listId); data.setIndustryId(industryId); + data.setItemId(RandomNumber.getUUid()); cachedDataList.add(data); // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM if (cachedDataList.size() >= BATCH_COUNT) { @@ -109,6 +119,8 @@ public class InListListener implements ReadListener { public void doAfterAllAnalysed(AnalysisContext context) { //这里也要保存数据，确保最后遗留的数据也存储到数据库 saveList(); + // 存储完成清理 list + queryList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT); log.info("所有数据解析完成！"); } @@ -128,8 +140,6 @@ public class InListListener implements ReadListener { private void saveList() { log.info("{}条数据，开始存储数据库！", cachedDataList.size()); int result = inListMapper.insertList(queryList); - //清空list - queryList = new ArrayList<>(); log.info("存储数据库成功！"); } } diff --git a/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/ReadTest.java b/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/ReadTest.java index e51023e..635556c 100644 --- a/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/ReadTest.java +++ b/inventory-ent/src/main/java/com/rzyc/utils/easyexcel/ReadTest.java @@ -20,35 +20,5 @@ import org.springframework.beans.factory.annotation.Autowired; @Slf4j public class ReadTest { - @Autowired - InListMapper inListMapper; - - @Autowired - InListItemMapper inListItemMapper; - - @Autowired - BaseInClassMapper baseInClassMapper; - - @Test - public void repeatedRead() { - String fileName = "导入模板.xlsx"; - // 读取全部sheet - // 这里需要注意 DemoDataListener的doAfterAllAnalysed 会在每个sheet读取完毕后调用一次。然后所有sheet都会往同一个DemoDataListener里面写 - EasyExcel.read(fileName, EasyExcelInList.class, new InListListener(inListMapper,inListItemMapper,baseInClassMapper)).doReadAll(); - -// 读取部分sheet -// fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; -// -// // 写法1 -// try (ExcelReader excelReader = EasyExcel.read(fileName).build()) { -// // 这里为了简单 所以注册了 同样的head 和Listener 自己使用功能必须不同的Listener -// ReadSheet readSheet1 = -// EasyExcel.readSheet(0).head(DemoData.class).registerReadListener(new DemoDataListener()).build(); -// ReadSheet readSheet2 = -// EasyExcel.readSheet(1).head(DemoData.class).registerReadListener(new DemoDataListener()).build(); -// // 这里注意 一定要把sheet1 sheet2 一起传进去，不然有个问题就是03版的excel 会读取多次，浪费性能 -// excelReader.read(readSheet1, readSheet2); -// } - } } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index 1bf70ed..696e10b 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -33,6 +33,7 @@ import com.rzyc.model.check.BookEntHT; import com.rzyc.model.check.ChkPerson; import com.rzyc.model.ent.*; import com.rzyc.model.user.*; +import com.rzyc.utils.ObjectConversion; import org.apache.ibatis.annotations.Param; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; @@ -2728,6 +2729,27 @@ public class BaseController { } } + + /** + * @author Xu wanxin + * @param industryId + * @param companyId + * @throws Exception + */ + public void saveEntInList(String industryId,String companyId)throws Exception{ + List inListItem = inListItemMapper.SelectContents(industryId,null); + List entLists = ObjectConversion.copy(inListItem,InEntList.class); + for (InEntList in:entLists) { + in.setEnterpriseId(companyId); + in.setEntListId(RandomNumber.getUUid()); + in.setCreateBy(getUserId()); + in.setCreateTime(new Date()); + in.setEnterpriseId(companyId); + } + int result = inEntListMapper.insertList(entLists); + } + + /** * 获取政府机构的管辖区域的id * @param userId diff --git a/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java index 5983d22..d4bd6f0 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java @@ -4,9 +4,7 @@ package com.rzyc.controller; import com.common.utils.DateUtils; import com.common.utils.RandomNumber; import com.common.utils.StringUtils; -import com.common.utils.model.MultiResult; -import com.common.utils.model.Pager; -import com.common.utils.model.SingleResult; +import com.common.utils.model.*; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.rzyc.model.dto.*; @@ -47,17 +45,11 @@ public class IndustryListController extends BaseController{ @ApiOperation(value = "父级行业列表", notes = "行业清单列表") @GetMapping("/industrySelect") @ResponseBody - public MultiResult industrySelect(){ + public MultiResult industrySelect(){ - MultiResult result = new MultiResult<>(); - ArrayList nameList = new ArrayList<>(); + MultiResult result = new MultiResult<>(); List baseInClassList = baseInClassMapper.findAll(); - //取出对象的name字段放入集合 - for (BaseInClass baseInClass : baseInClassList) { - String industryClassName = baseInClass.getIndustryclassname(); - nameList.add(industryClassName); - } - result.setData(nameList); + result.setData(baseInClassList); return result; } @@ -71,49 +63,33 @@ public class IndustryListController extends BaseController{ @ApiOperation(value = "行业清单列表", notes = "行业清单列表") @GetMapping("/industryListSelect") @ResponseBody - public MultiResult industryListSelect()throws Exception{ - MultiResult result = new MultiResult<>(); - ArrayList nameList = new ArrayList<>(); - List inLists = inListMapper.findAll(); - //取出对象的name字段放入集合 - if(inLists.size() > 0){ - for (InList inList : inLists) { - String name = inList.getName(); - nameList.add(name); - } - } - result.setData(nameList); + public MultiResult industryListSelect(String industry)throws Exception{ + MultiResult result = new MultiResult<>(); + List inLists = inListMapper.findAll(industry); + result.setData(inLists); return result; } @ApiOperation(value = "新增行业清单分类", notes = "新增行业清单分类") @PostMapping("/industryListAdd") @ResponseBody - public MultiResult industryListAdd(@Valid @RequestBody InListAddDto inListAddDto){ - + public MultiResult industryListAdd(@Valid @RequestBody InListAddDto inListAddDto) throws Exception { MultiResult result = new MultiResult<>(); InList inList = new InList(); //前端数据拷贝至对象 BeanUtils.copyProperties(inListAddDto,inList); //industryId设null表示共有清单 - if(StringUtils.isBlank(inList.getListId())){ //补全对象其余字段 inList.setListId(RandomNumber.getUUid()); inList.setDelState(1); inList.setCreateTime(new Date()); - inList.setIndustryId(null); - + inList.setCreateBy(getUserId()); } - //industryId不设Null表示公有清单 - if(StringUtils.isBlank(inList.getListId())){ - //补全对象其余字段 - inList.setListId(RandomNumber.getUUid()); - inList.setDelState(1); - inList.setCreateTime(new Date()); - //暂时设定危化品父级下 - inList.setIndustryId("01c2afc4-cb18-4ac1-9560-b4708877db26"); - + int num = inListMapper.insert(inList); + if (num <= 0){ + result.setCode(Code.ERROR.getCode()); + result.setMessage(Message.ERROR); } return result; } @@ -127,13 +103,13 @@ public class IndustryListController extends BaseController{ * @throws Exception */ @ApiOperation(value = "所属清单项列表分页", notes = "所属清单项列表分页") - @GetMapping("/industryListItemSelect") + @PostMapping("/industryListItemSelect") @ResponseBody public SingleResult> industryListItemSelect(@RequestBody InListPageDto inListPageDto) throws Exception { SingleResult> result = new SingleResult<>(); Pager pager = new Pager<>(); PageHelper.startPage(inListPageDto.getPage(),inListPageDto.getPageSize()); - Page page = (Page)inListItemMapper.SelectContents(); + Page page = (Page)inListItemMapper.SelectContents(inListPageDto.getIndustryId(),inListPageDto.getListId()); getDatePage(pager,page); result.setData(pager); return result; @@ -149,7 +125,7 @@ public class IndustryListController extends BaseController{ @PostMapping("/deleteInListItem") @ResponseBody public SingleResult deleteInListItem(@Valid @RequestBody InListItemDto inListItemDto)throws Exception{ - inListItemMapper.deleteById(inListItemDto.getItem_id()); + inListItemMapper.deleteById(inListItemDto.getItemId()); return new SingleResult(); } @@ -169,7 +145,7 @@ public class IndustryListController extends BaseController{ BaseInClass baseInClass = baseInClassMapper.selectByPrimaryKey(inListItemAddDto.getIndustryId()); if(null == inList){ result.setCode(0); - result.setMessage("用户不存在"); + result.setMessage("清单不存在"); return result; } if(StringUtils.isBlank(inListItem.getItemId())){ @@ -187,11 +163,8 @@ public class IndustryListController extends BaseController{ inListItem.setModifyBy(inList.getListId()); //inListItem.setIndustryId(baseInClass.getBaseinclassid()); inListItemMapper.updateById(inListItem); - } - return result; - } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java index a61937c..08b95e5 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java @@ -2126,7 +2126,8 @@ public class MinWorkController extends BaseController{ //生成最小工作单元 saveEntWork(sysEnterprise.getSysenterpriseid()); - + //生成行业对应的企业责任清单 + saveEntInList(sysEnterprise.getBaseinclassid(),sysEnterprise.getSysenterpriseid()); //创建或者修改企业用户 createEntUser(sysEnterprise,sysUser.getChinaname(),sysUser); if (result > 0){ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index d67298c..daaabbd 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -1221,7 +1221,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { public SingleResult changePerformRecord(@Valid @RequestBody AddPerformRecordDto addPerformRecordDto)throws Exception{ SingleResult result = new SingleResult<>(); ListDetailWithBLOBs listDetail = new ListDetailWithBLOBs(); - BeanUtils.copyProperties(listDetail,addPerformRecordDto); + org.springframework.beans.BeanUtils.copyProperties(addPerformRecordDto,listDetail); //处理时间 listDetail.setStarttime(DateUtils.parseString2Date(addPerformRecordDto.getStartTime(),"yyyy-MM-dd")); diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index 10e41d1..554e9dd 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -540,7 +540,7 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { * 报错No value specified for Date * */ ConvertUtils.register(new DateConverter(null), Date.class); - BeanUtils.copyProperties(sysEnterprise,sysEnterpriseDo); + org.springframework.beans.BeanUtils.copyProperties(sysEnterpriseDo,sysEnterprise); String token = servletRequest.getHeader("userToken"); String userId = JwtUtil.getTokenMsg(token); if (StringUtils.isBlank(userId)){ @@ -591,7 +591,8 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { //生成最小工作单元 saveEntWork(sysEnterprise.getSysenterpriseid()); - + //生成行业对应的企业责任清单 + saveEntInList(sysEnterprise.getWorkClassId(),sysEnterprise.getSysenterpriseid()); //创建或者修改企业用户 createEntUser(sysEnterprise,sysUser.getChinaname(),sysUser); diff --git a/inventory-gov/src/main/java/com/rzyc/utils/ObjectConversion.java b/inventory-gov/src/main/java/com/rzyc/utils/ObjectConversion.java new file mode 100644 index 0000000..e3ab466 --- /dev/null +++ b/inventory-gov/src/main/java/com/rzyc/utils/ObjectConversion.java @@ -0,0 +1,38 @@ +package com.rzyc.utils; + + + +import java.util.List; + +import com.alibaba.fastjson.JSON; + +/** + * 两个对象或集合同名属性赋值 +* @author Xu wanxin + */ +public class ObjectConversion { + + /** + * 从List copy到List + * @param list List + * @param clazz B + * @return List + */ + public static List copy(List list,Class clazz){ + String oldOb = JSON.toJSONString(list); + return JSON.parseArray(oldOb, clazz); + } + + /** + * 从对象A copy到 对象B + * @param ob A + * @param clazz B.class + * @return B + */ + public static T copy(Object ob,Class clazz){ + String oldOb = JSON.toJSONString(ob); + return JSON.parseObject(oldOb, clazz); + } +} + + diff --git a/inventory-gov/src/main/resources/application.yml b/inventory-gov/src/main/resources/application.yml index a6560f0..a703748 100644 --- a/inventory-gov/src/main/resources/application.yml +++ b/inventory-gov/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev #设定打包配置文件 + active: prod #设定打包配置文件