From f96714b0d2961312b78734df108aa5426a0cb041 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 12 Apr 2022 17:40:20 +0800 Subject: [PATCH] =?UTF-8?q?4-12=20=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/login/rest/LoginRestController.java | 34 ++++- .../ProductDeptIssueController.java | 5 +- .../dao/BusinessDeptIssueDao.java | 3 +- .../dao/ProductDeptIssueDao.java | 4 +- .../entity/BusinessDeptIssue.java | 129 ++++++++++-------- .../entity/ProductDeptIssue.java | 85 ++++++------ .../impl/BusinessDeptIssueService.java | 8 +- .../service/impl/ProductDeptIssueService.java | 44 +++--- .../BusinessDeptIssuempaaer.xml | 25 +++- .../ProductDeptIssuempaaer.xml | 70 +++++++++- 10 files changed, 266 insertions(+), 141 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index 7ec36fb3..d4867481 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -8,6 +8,7 @@ import com.adc.da.login.util.IDMUtil; import com.adc.da.login.util.JwtUtils; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; +import com.adc.da.util.Encodes; import com.adc.da.util.PasswordUtils; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; @@ -17,10 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import sun.misc.BASE64Encoder; import javax.servlet.http.Cookie; @@ -29,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.List; @@ -78,6 +77,33 @@ public class LoginRestController { } } + @ApiOperation(value = "登录") +// @GetMapping(value = "/login") + @GetMapping(value = "/checkPage") + @ResponseBody + public ResponseMessage checkPage(@RequestParam @NotNull(message = "请输入用户名") String username) throws UnsupportedEncodingException { + username =new String(Encodes.decodeBase64(username), StandardCharsets.UTF_8); + UserEO userEO = userService.getUserByLoginNameNotDeleted(username); + if (null == userEO) { + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号不存在"); + } + if(userEO.getDisableFlag()==1){ + log.info("用户[{}]身份验证失败", username); + return Result.error("r0011", "您输入的帐号已禁用"); + } + + String token = jwtUtils.generateToken(userEO.getUsid()); + // 加密重要信息 + BASE64Encoder encoder = new BASE64Encoder(); + userEO.setToken(token); + String userStr = JSON.toJSONString(userEO); + String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + userStr = encoder.encode(userStr2.getBytes()); + return Result.success(userStr); + + } + @ApiOperation(value = "登录") @PostMapping(value = "/loginIdm") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java index 2153a48b..87df8d40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java @@ -53,7 +53,7 @@ public class ProductDeptIssueController { @GetMapping @ApiOperation("查询产品规划部重点问题") - public ResponseMessage> getProductDeptIssue(@RequestParam ProductDeptIssueVo wrapper){ + public ResponseMessage> getProductDeptIssue(ProductDeptIssueVo wrapper){ IPage issueList = iProductDeptIssueService.getProductDeptIssue(wrapper); return Result.success(issueList); } @@ -64,7 +64,8 @@ public class ProductDeptIssueController { boolean b = iProductDeptIssueService.updateProductDeptIssue(issue); return Result.success(b); } - +// 多态对接口具有可替换性接口 灵活性简化性易拓展 可替换的概念可以理解伟方法可以被同类重用 +// 可扩充性可以理解为该方法可以添加子类而不影响现有代码，接口性就是指的是向子类提供一个公用的高级接口子类来集成完善这个接口中的方法来实现要求。 @PostMapping("/closeProductIssue") @ApiOperation("关闭产品规划部重点问题") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java index 7ceffc8f..7416fb46 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java @@ -15,5 +15,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface BusinessDeptIssueDao extends BaseMapper { - IPage findPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage findPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper + ,@Param("dept") String dept); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java index ccef897d..1ddac4bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,5 +12,6 @@ import org.apache.ibatis.annotations.Param; public interface ProductDeptIssueDao extends BaseMapper { - public IPage findPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper wrapper); + public IPage findPage1(IPage page,@Param(Constants.WRAPPER) QueryWrapper wrapper); + public IPage findPage(IPage page, @Param("ew") ProductDeptIssueVo objVo); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java index 3f4d6a3b..a10bce66 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -19,82 +19,91 @@ import java.util.Date; public class BusinessDeptIssue { - @ExcelIgnore - @TableId - private String id; + @ExcelIgnore + @TableId + private String id; - @ExcelIgnore - @TableField("law_id") - private String lawId; + @ExcelIgnore + @TableField("law_id") + private String lawId; - @ExcelProperty("标准号") - @TableField(exist = false) - private String lawNumber; + @ExcelProperty("标准号") + @TableField(exist = false) + private String lawNumber; - @ExcelProperty("标准名称") - @TableField(exist = false) - private String lawName; + @ExcelProperty("标准名称") + @TableField(exist = false) + private String lawName; - @ExcelProperty("产品类别") - @TableField("product_type") - private String productType; + @ExcelProperty("产品类别") + @TableField("product_type") + private String productType; - @ExcelProperty("实施实践") - @TableField("impl_time") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") - private Date implTime; + @ExcelProperty("实施实践") + @TableField("impl_time") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + private Date implTime; - @ExcelProperty("实施要求") - @TableField("impl_require") - private String implRequire; + @ExcelProperty("实施要求") + @TableField("impl_require") + private String implRequire; - @ExcelProperty("资源符合状态") - @TableField("conform_situation") - private String conformSituation; + @ExcelProperty("资源符合状态") + @TableField("conform_situation") + private String conformSituation; - @ExcelProperty("开发情况") - @TableField("dev_scheme") - private String devScheme; + @ExcelProperty("开发情况") + @TableField("dev_scheme") + private String devScheme; - @ExcelProperty("sop时间") - @TableField("sop_time") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") - private Date sopTime; + @ExcelProperty("sop时间") + @TableField("sop_time") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + private Date sopTime; - @ExcelProperty("完成情况") - @TableField("complete_situation") - private String completeSituation; + @ExcelProperty("完成情况") + @TableField("complete_situation") + private String completeSituation; - @ExcelProperty("超出sop时限后计划") - @TableField("timeout_situation") - private String timeoutSituation; + @ExcelProperty("超出sop时限后计划") + @TableField("timeout_situation") + private String timeoutSituation; - @ExcelIgnore - @TableLogic(value = "0",delval = "1") - @TableField("del_flag") - private String delFlag; + @ExcelIgnore + @TableLogic(value = "0", delval = "1") + @TableField("del_flag") + private String delFlag; - @ExcelProperty("责任部门") - @TableField("response_dept") - private String responseDept; + @ExcelProperty("责任部门") + @TableField("response_dept") + private String responseDept; - @ExcelProperty("责任人") - @TableField("response_people") - private String responsePeople; + @ExcelProperty("责任人") + @TableField("response_people") + private String responsePeople; - @ExcelIgnore - @TableField("is_close") - private String isClose; + @ExcelIgnore + @TableField("is_close") + private String isClose; - @ExcelIgnore - @TableField("is_risk") - private String isRisk; + @ExcelIgnore + @TableField("is_risk") + private String isRisk; - @ExcelIgnore - @TableField(exist = false) - private Integer page; + @ExcelIgnore + @TableField(exist = false) + private Integer page; - @ExcelIgnore - @TableField(exist = false) - private Integer pageSize; + @ExcelIgnore + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private String responseInsId; + + @TableField(exist = false) + private String responseInsName; + + @TableField(exist = false) + private String responseUserName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java index 2acb71ee..5642c802 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java @@ -15,60 +15,69 @@ import java.util.Date; @TableName("product_dept_issue") public class ProductDeptIssue { - @TableId - private String id; + @TableId + private String id; - @TableField("law_id") - private String lawId; + @TableField("law_id") + private String lawId; - @TableField(exist = false) - private String lawsNumber; + @TableField(exist = false) + private String lawsNumber; - @TableField(exist = false) - private String lawsName; + @TableField(exist = false) + private String lawsName; - @TableField("product_business") - private String productBusiness; + @TableField("product_business") + private String productBusiness; - @TableField("platform") - private String platform; + @TableField("platform") + private String platform; - @TableField("poj_name") - private String pojName; + @TableField("poj_name") + private String pojName; - @TableField("poj_description") - private String pojDescription; + @TableField("poj_description") + private String pojDescription; - @TableField("current_node") - private String currentNode; + @TableField("current_node") + private String currentNode; - @TableField("conceptual_state") - private String conceptualState; + @TableField("conceptual_state") + private String conceptualState; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") - @TableField("scheduled_issuance_time") - private Date scheduledIssuanceTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + @TableField("scheduled_issuance_time") + private Date scheduledIssuanceTime; - @TableField("revised_plan") - private String revisedPlan; + @TableField("revised_plan") + private String revisedPlan; - @TableField("explanation") - private String explanation; + @TableField("explanation") + private String explanation; - @TableField("response_dept") - private String responseDept; + @TableField("response_dept") + private String responseDept; - @TableLogic(value = "0",delval = "1") - @TableField("del_flag") - private String delFlag; + @TableLogic(value = "0", delval = "1") + @TableField("del_flag") + private String delFlag; - @TableField("is_close") - private String isClose; + @TableField("is_close") + private String isClose; - @TableField(exist = false) - private Integer page; + @TableField(exist = false) + private Integer page; - @TableField(exist = false) - private Integer pageSize; + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private String responseInsId; + + @TableField(exist = false) + private String responseInsName; + + @TableField(exist = false) + private String responseUserName; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java index b807d0c6..cc5a153b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java @@ -63,9 +63,9 @@ public class BusinessDeptIssueService extends ServiceImpl getProductDeptIssue(ProductDeptIssueVo objVo) { - IPage page=new Page<>(objVo.getPage(),objVo.getPage()); + IPage page=new Page<>(objVo.getPage(),objVo.getPageSize()); - QueryWrapper wrapper = new QueryWrapper<>(); - //查询条件 - if (objVo.getIsClose()!=null){ - wrapper.like("is_close",objVo.getIsClose()); - } - - - if (objVo.getLawsNumber()!=null){ - wrapper.like("laws.LAWS_NAME",objVo.getLawsName()) - .or() - .like("laws.LAWS_NUMBER",objVo.getLawsNumber()); - } - - if (objVo.getPojName()!=null){ - wrapper.like("poj_name",objVo.getPojName()); - } - - if (objVo.getResponseDept()!=null){ - wrapper.like("response_dept",objVo.getResponseDept()); - } - productDeptIssueDao.findPage(page,wrapper); +// QueryWrapper wrapper = new QueryWrapper<>(); +// //查询条件 +// if (objVo.getIsClose()!=null){ +// wrapper.like("is_close",objVo.getIsClose()); +// } +// +// +// if (objVo.getLawsNumber()!=null){ +// wrapper.like("laws.LAWS_NAME",objVo.getLawsName()) +// .or() +// .like("laws.LAWS_NUMBER",objVo.getLawsNumber()); +// } +// +// if (objVo.getPojName()!=null){ +// wrapper.like("poj_name",objVo.getPojName()); +// } +// +// if (objVo.getResponseDept()!=null){ +// wrapper.like("response_dept",objVo.getResponseDept()); +// } + productDeptIssueDao.findPage(page,objVo); return page; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml index 5ae76e9d..12aec4cc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml @@ -23,22 +23,32 @@ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml index fca51789..4130cd2c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml @@ -21,12 +21,72 @@