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 f2d5190..e22a3da 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 @@ -1,8 +1,11 @@ package com.rzyc.mapper.ent; +import com.rzyc.model.ent.BaseInClass; import com.rzyc.model.ent.InList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** *

* 行业清单 Mapper 接口 @@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2022-09-20 */ public interface InListMapper extends BaseMapper { - + /*查询所有*/ + List findAll(); } diff --git a/inventory-dao/src/main/java/com/rzyc/model/dto/InListDto.java b/inventory-dao/src/main/java/com/rzyc/model/dto/InListDto.java new file mode 100644 index 0000000..23104ae --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InListDto.java @@ -0,0 +1,42 @@ +package com.rzyc.model.dto; + + +import io.swagger.annotations.ApiModelProperty; + +public class InListDto { + + + + @ApiModelProperty(value = "清单名") + private String name; + + @ApiModelProperty(value = "行业清单id") + private String list_id; + + @ApiModelProperty(value = "清单排序") + private Integer sort_id; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getList_id() { + return list_id; + } + + public void setList_id(String list_id) { + this.list_id = list_id; + } + + public Integer getSort_id() { + return sort_id; + } + + public void setSort_id(Integer sort_id) { + this.sort_id = sort_id; + } +} 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 new file mode 100644 index 0000000..35b53b6 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/model/dto/InListItemDto.java @@ -0,0 +1,50 @@ +package com.rzyc.model.dto; + +import io.swagger.annotations.ApiModelProperty; + +public class InListItemDto { + + @ApiModelProperty(value = "清单项id") + private String item_id; + + @ApiModelProperty(value = "行业清单id") + private String list_id; + + @ApiModelProperty(value = "行业id") + private String industry_id; + + @ApiModelProperty(value = "清单内容") + private String item_content; + + public String getItem_content() { + return item_content; + } + + public void setItem_content(String item_content) { + this.item_content = item_content; + } + + public String getItem_id() { + return item_id; + } + + public void setItem_id(String item_id) { + this.item_id = item_id; + } + + public String getList_id() { + return list_id; + } + + public void setList_id(String list_id) { + this.list_id = list_id; + } + + public String getIndustry_id() { + return industry_id; + } + + public void setIndustry_id(String industry_id) { + this.industry_id = industry_id; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java b/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java index 67e4caf..a920e24 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/InList.java @@ -54,6 +54,7 @@ public class InList implements Serializable { @TableField("modify_by") private String modifyBy; + public String getListId() { return listId; } diff --git a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml index 7816524..7b62bf3 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml @@ -19,4 +19,10 @@ list_id, name, sort_id,del_state, create_time, create_by, modify_time, modify_by + + + + 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 9ff71a4..bc42e98 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -268,7 +268,7 @@ public class BaseController { @Autowired protected SysRoleResourceMapper sysRoleResourceMapper; - //请求对象 + //浏览器对象 @Autowired protected HttpServletRequest request; @@ -336,6 +336,10 @@ public class BaseController { @Autowired protected IndustryWorkMapper industryWorkMapper; +// //企业监管用户 +// @Autowired +// protected EntUserMapper entUserMapper; + //责任树 @Autowired protected DutyTreeMapper dutyTreeMapper; @@ -444,6 +448,16 @@ public class BaseController { @Autowired protected SysDocumenttempMapper sysDocumenttempMapper; + //企业清单 + @Autowired + protected InListMapper inListMapper; + + //所属清单项 + @Autowired + protected InListItemMapper inListItemMapper; + + // + /** * 岗位不需要的字符串 */ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java new file mode 100644 index 0000000..f1d9413 --- /dev/null +++ b/inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java @@ -0,0 +1,143 @@ +package com.rzyc.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.common.utils.model.MultiResult; +import com.common.utils.model.SingleResult; +import com.rzyc.mapper.ent.InListMapper; +import com.rzyc.model.dto.InListDto; +import com.rzyc.model.dto.InListItemDto; +import com.rzyc.model.ent.BaseInClass; +import com.rzyc.model.ent.InList; +import com.rzyc.model.ent.InListItem; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.service.ApiListing; + +import javax.swing.*; +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Api(tags = "行业清单") +@CrossOrigin("*") +@RequestMapping("industryList") +@Validated +@RestController +public class IndustryListController extends BaseController{ + + /** + * 父级行业列表 + * @return + */ + @ApiOperation(value = "父级行业列表", notes = "行业清单列表") + @PostMapping("/selectIndustry") + @ResponseBody + public MultiResult selectIndustry(){ + + MultiResult result = new MultiResult<>(); + ArrayList nameList = new ArrayList<>(); + List baseInClassList = baseInClassMapper.findAll(); + for (BaseInClass baseInClass : baseInClassList) { + String industryClassName = baseInClass.getIndustryclassname(); + nameList.add(industryClassName); + } + result.setData(nameList); + return result; + } + + + /** + * 查询行业清单 + * @param + * @return + * @throws Exception + */ + + @ApiOperation(value = "行业清单列表", notes = "行业清单列表") + @PostMapping("/industryListSelect") + @ResponseBody + public MultiResult industryListSelect(@Valid @RequestBody BaseInClass baseInClass)throws Exception{ + MultiResult result = new MultiResult<>(); + ArrayList nameList = new ArrayList<>(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + //lqw.eq(InList::,) + List inLists = inListMapper.findAll(); + if(inLists.size() > 0){ + for (InList inList : inLists) { + String name = inList.getName(); + nameList.add(name); + } + } + result.setData(nameList); + return result; + } + + + + /** + * 新增清单列 + * @param inListDto + * @return + */ + @ApiOperation(value = "新增清单列", notes = "新增清单列") + @PostMapping("/addInList") + @ResponseBody + public SingleResult addInList(@Valid @RequestBody InListDto inListDto){ + InList inList = inListMapper.selectById(inListDto.getList_id()); + if(inList == null){ + InList addInList = new InList(); + BeanUtils.copyProperties(addInList,inListDto); + addInList.setCreateTime(new Date()); + //addInList.getCreateBy(getUserId()) + } + return new SingleResult(); + } + + + + + /** + * 查询行业清单的所属清单项 + * @param inListDto + * @return + * @throws Exception + */ + @ApiOperation(value = "所属清单项列表", notes = "所属清单项列表") + @PostMapping("/industryListItemSelect") + @ResponseBody + public MultiResult industryListItemSelect(@RequestBody InListDto inListDto)throws Exception{ + MultiResult result = new MultiResult<>(); + ArrayList contentList = new ArrayList<>(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper queryWrapper = lambdaQueryWrapper + .eq(InListItem::getListId, inListDto.getList_id()); + List inListItems = inListItemMapper.selectList(queryWrapper); + for (InListItem inListItem : inListItems) { + String itemContent = inListItem.getItemContent(); + contentList.add(itemContent); + } + result.setData(contentList); + return result; + } + + /** + * 删除清单项 + * @param inListItemDto + * @return + */ + @ApiOperation(value = "删除清单项", notes = "删除清单项") + @PostMapping("/deleteInListItem") + @ResponseBody + public SingleResult deleteInListItem(@Valid @RequestBody InListItemDto inListItemDto){ + inListItemMapper.deleteById(inListItemDto.getItem_id()); + return new SingleResult(); + } + + + +} 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 b0f4916..d5bfd46 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -1721,6 +1721,30 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { } return result; }*/ +// /** +// * 任务详情 +// * @param taskDetailDto +// * @return +// * @throws Exception +// */ +// @LoginAuth +// @ApiOperation(value = "任务详情", notes = "任务详情") +// @PostMapping(value = "taskDetail") +// @ResponseBody +// public SingleResult taskDetail(@Valid TaskDetailDto taskDetailDto)throws Exception{ +// SingleResult result = new SingleResult<>(); +// OATask oaTask = oaTaskMapper.taskDetail(taskDetailDto.getTaskId(),taskDetailDto.getUserId()); +// if(null != oaTask){ +// //任务详情处理 +// getTaskDetail(oaTask,taskDetailDto.getUserId()); +// handleTaskDetail(oaTask); +// result.setData(oaTask); +// }else{ +// result.setCode(Code.NO_DATA.getCode()); +// result.setMessage(Message.NO_DATA); +// } +// return result; +// } /** * 认证日志分页 diff --git a/inventory-gov/src/main/resources/application-prod.yml b/inventory-gov/src/main/resources/application-prod.yml index 7254470..047d529 100644 --- a/inventory-gov/src/main/resources/application-prod.yml +++ b/inventory-gov/src/main/resources/application-prod.yml @@ -90,6 +90,7 @@ onstants: word_tmp: /mnt/rzyc/resource/inventory/wordtmp + #加密 jasypt: encryptor: