From 209f43fe1ad776ce5d75ad5ca9917e51d8439be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=82=96=E4=BA=91?= <2816048001@qq.com> Date: Fri, 25 Jun 2021 15:49:30 +0800 Subject: [PATCH] =?UTF-8?q?fetch:=E4=BA=BA=E5=91=98=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 4 +- .../controller/TsInstitutionController.java | 2 +- .../adc/da/slrs/sarMenu/entity/SarMenu.java | 4 ++ .../slrs/sarMenu/service/ISarMenuService.java | 7 ++ .../service/impl/SarMenuServiceImpl.java | 12 ++++ .../entity/SarUserPersonalMenu.java | 8 +++ .../controller/TsPositionController.java | 2 +- .../sarRole/controller/TsRoleController.java | 2 +- .../service/impl/TsRoleServiceImpl.java | 5 ++ .../entity/SarStandUnqualified.java | 72 ++++++++++--------- .../sarUser/controller/TsUserController.java | 2 +- .../adc/da/slrs/sarUser/entity/TsUser.java | 8 +++ 12 files changed, 89 insertions(+), 39 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 88425a41..afdb5624 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,9 +3,9 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root -spring.datasource.password = 1q2w3e4r +spring.datasource.password = Zxy20010202 #============================================== # 应用设置 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index a3e5731d..bd0a9c4d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -29,7 +29,7 @@ import java.util.List; */ @RestController @Api(tags = "|机构管理|") -@RequestMapping("/SarInstitution/institution") +@RequestMapping("/api/SarInstitution/institution") public class TsInstitutionController extends BaseController { @Autowired private ITsInstitutionService tsInstitutionService; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java index f2ea1c02..cc551c85 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/entity/SarMenu.java @@ -61,6 +61,10 @@ public class SarMenu extends BaseEntity { @TableField("DISPLAY_SEQ") private Integer displaySeq; + @ApiModelProperty(value = "路径") + @TableField("HREF") + private String href; + @ApiModelProperty(value = "是否有效") @TableField("VALID_FLAG") private Integer validFlag; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/ISarMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/ISarMenuService.java index cfed4f02..e2251a29 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/ISarMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/ISarMenuService.java @@ -24,4 +24,11 @@ public interface ISarMenuService extends IService { List queryRoleMenuIdList(String sordDivide, String menuId) throws Exception; List getChildMenuList(String menuId); + + /** + * 通过ids查询menus + * @param menuIds:菜单ID + * @return List + */ + List getMenusByIds(List menuIds); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java index 2963c6dc..334d5cfc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java @@ -152,4 +152,16 @@ public class SarMenuServiceImpl extends ServiceImpl impleme } return menuIds; } + + /** + * 通过ids查询menus + * @param menuIds:菜单ID + * @return List + */ + @Override + public List getMenusByIds(List menuIds) { + QueryWrapper menuQueryWrapper=new QueryWrapper<>(); + menuQueryWrapper.in("id",menuIds); + return dao.selectList(menuQueryWrapper); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenu.java index 514354c8..c8005efd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenu.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenu.java @@ -35,4 +35,12 @@ public class SarUserPersonalMenu extends BaseEntity { private String menuUrl; + public SarUserPersonalMenu(String menuName, String menuId, String menuUrl) { + this.menuName = menuName; + this.menuId = menuId; + this.menuUrl = menuUrl; + } + + public SarUserPersonalMenu() { + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java index d9abac47..f43b10b3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java @@ -27,7 +27,7 @@ import java.util.List; */ @RestController @Api(tags = "|岗位管理|") -@RequestMapping("/sarPosition/position") +@RequestMapping("/api/sarPosition/position") public class TsPositionController extends BaseController { @Autowired private ITsPositionService tsPositionService; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index 0dbb2f61..a3c855f4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -29,7 +29,7 @@ import java.util.List; */ @RestController @Api(tags = "|角色管理|") -@RequestMapping("/sarRole/role") +@RequestMapping("/api/sarRole/role") public class TsRoleController extends BaseController { @Autowired private ITsRoleService tsRoleService; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index 01abcfc2..3837f208 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarRole.service.impl; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; @@ -29,6 +30,8 @@ import java.util.Map; public class TsRoleServiceImpl extends ServiceImpl implements ITsRoleService { @Autowired private TsRoleDao tsRoleDao; + @Autowired + private ISarMenuService sarMenuService; /** * 查询所有角色 @@ -161,6 +164,8 @@ public class TsRoleServiceImpl extends ServiceImpl implements for(String menuId:deleteIds){ tsRoleDao.delMenu(tsRoleMenuVO.getRoleId(),menuId); } + //修改首页自定义目录 +// List menus=sarMenuService.getMenusByIds(tsRoleMenuVO.getMenuIds()); return Result.success(); } 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 index 17781e2e..2dd65a21 100644 --- 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 @@ -34,6 +34,41 @@ public class SarStandUnqualified extends BaseEntity { private static final long serialVersionUID = 1L; + @ExcelProperty("标准编号") + @ApiModelProperty(value = "标准ID") + @TableField("STAND_ID") + private String standId; + + @ExcelProperty("标准名称") + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ExcelProperty("条款号") + @ApiModelProperty(value = "条款号") + @TableField("ITEMS_NUM") + private String itemsNum; + + @ExcelProperty("条款名称") + @ApiModelProperty(value = "条款名称") + @TableField("ITEMS_NAME") + private String itemsName; + + @ExcelProperty("产品线") + @ApiModelProperty(value = "产品线") + @TableField("PRODUCT_LINE") + private String productLine; + + @ExcelProperty("责任部门") + @ApiModelProperty(value = "责任部门") + @TableField("RESPONSIBLE_UNIT") + private String responsibleUnit; + + @ExcelProperty("项目名称") + @ApiModelProperty(value = "项目名称") + @TableField("PRODUCT_NAME") + private String productName; + @ExcelProperty("创建部门") @ApiModelProperty(value = "创建部门") @TableField("CREATE_DEPT_ID") @@ -70,6 +105,10 @@ public class SarStandUnqualified extends BaseEntity { @TableField("PLAN_CLOSE_TIME") private Timestamp planCloseTime; + @ApiModelProperty(value = "未符合原因") + @TableField("REASON") + private String reason; + @ExcelProperty("质量工程师") @ApiModelProperty(value = "质量工程师") @TableField("QA_ENGINEER") @@ -85,46 +124,13 @@ public class SarStandUnqualified extends BaseEntity { @TableField("DUTY_ENGINEER") private String dutyEngineer; - @ExcelProperty("责任部门") - @ApiModelProperty(value = "责任部门") - @TableField("RESPONSIBLE_UNIT") - private String responsibleUnit; - @ExcelProperty("项目名称") - @ApiModelProperty(value = "项目名称") - @TableField("PRODUCT_NAME") - private String productName; - - @ExcelProperty("产品线") - @ApiModelProperty(value = "产品线") - @TableField("PRODUCT_LINE") - private String productLine; @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）") @TableField("PRODUCT_TYPE") private String productType; - @ExcelProperty("条款名称") - @ApiModelProperty(value = "条款名称") - @TableField("ITEMS_NAME") - private String itemsName; - - @ExcelProperty("条款号") - @ApiModelProperty(value = "条款号") - @TableField("ITEMS_NUM") - private String itemsNum; - - @ExcelProperty("标准名称") - @ApiModelProperty(value = "标准名称") - @TableField("STAND_NAME") - private String standName; - - @ExcelProperty("标准编号") - @ApiModelProperty(value = "标准ID") - @TableField("STAND_ID") - private String standId; - @ExcelIgnore @ApiModelProperty(value = "主键") @TableId("ID") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index a3efd94a..465d6f38 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -25,7 +25,7 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(tags = "|人员管理|") -@RequestMapping("/sarUser/user") +@RequestMapping("/api/sarUser/user") public class TsUserController extends BaseController { @Autowired private ITsUserService tsUserService; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java index eaa78cf3..6fc4ce3b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -61,6 +61,14 @@ public class TsUser extends BaseEntity { @TableField("USER_SOURCE") private String userSource; + @ApiModelProperty(value = "用户手机号") + @TableField("PHONE") + private String phone; + + @ApiModelProperty(value = "用户状态") + @TableField("STATE") + private String state; + @ApiModelProperty(value = "用户邮箱") @TableField("EMAIL") private String email;