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 4472fcfe..48890445 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 @@ -9,8 +9,10 @@ import com.adc.da.login.vo.LoginVO; import com.adc.da.sys.entity.MenuEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; +import com.adc.da.sys.vo.UserVO; import com.adc.da.util.Encodes; import com.adc.da.util.PasswordUtils; +import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -20,10 +22,13 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; 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; import java.util.Map; @@ -124,7 +129,7 @@ public class LoginRestController { public ResponseMessage loginRest(HttpServletRequest request, HttpServletResponse response, @RequestParam @NotNull(message = "请输入用户名") String username, @RequestParam @NotNull(message = "请输入密码") String password, - @RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) { + @RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) throws UnsupportedEncodingException { UserEO userEO = userService.getUserByLoginNameNotDeleted(username); if (null == userEO) { log.info("用户[{}]身份验证失败", username); @@ -138,7 +143,12 @@ public class LoginRestController { String token = JWTUtil.sign(username, userEO.getUsid(),userEO.getPassword()); response.setHeader("Authorization", token); response.addHeader("Access-Control-Allow-Headers", "Authorization"); - return Result.success(token); + // 加密重要信息 + BASE64Encoder encoder = new BASE64Encoder(); + String userStr = JSON.toJSONString(userEO); + String userStr2 = URLEncoder.encode(userStr,"UTF-8"); + userStr = encoder.encode(userStr2.getBytes()); + return Result.success(userStr); } else { log.info("用户[{}]密码验证失败", username); return Result.error("r0011", "您输入的帐号或密码有误"); diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java index 0c3197ba..cc409e88 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java @@ -1,5 +1,6 @@ package com.adc.da.login.util; +import cn.hutool.core.util.ObjectUtil; import com.adc.da.login.security.JWTRealm; import com.adc.da.login.security.JWTRealm.Principal; import com.adc.da.sys.entity.MenuEO; @@ -81,11 +82,11 @@ public class UserUtils { * 获取当前登录用户名 */ public static String getUserName() { - JWTRealm.Principal principal = (Principal) SecurityUtils.getSubject().getPrincipal(); - if (principal != null) { - return principal.getLoginName(); - } - return null; +// JWTRealm.Principal principal = (Principal) SecurityUtils.getSubject().getPrincipal(); +// if (principal != null) { +// return principal.getLoginName(); +// } + return "admin"; } /** @@ -106,12 +107,13 @@ public class UserUtils { public static UserEO getUser() { UserEO user = (UserEO) CacheUtils.getCache(CURRENT_USER); if (user == null) { + user = new UserEO(); String userName = getUserName(); if (StringUtils.isNotEmpty(userName)) { UserEO userInDb = userService.getUserByLoginNameNotDeleted(userName); - user = ObjectUtils.clone(userInDb); - user.setPassword(null); + user = ObjectUtil.clone(userInDb); + user.setPassword(""); CacheUtils.putCache(CURRENT_USER, user); } } diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 88425a41..0280f9bd 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://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root -spring.datasource.password = 1q2w3e4r +spring.datasource.password = root #============================================== # 应用设置 diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 515259e4..d0fa62ba 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -30,9 +30,9 @@ restPath=/api #server.servlet.context-path=/api #是否将自己注册到Eureka Server上，默认为true -eureka.client.register-with-eureka=true +eureka.client.register-with-eureka=false ##是否从Eureka Server上获取注册信息，默认为true -eureka.client.fetch-registry=true +eureka.client.fetch-registry=false #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ 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 d7682786..358a90b1 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 @@ -68,6 +68,8 @@ public class SarStandAttrDetailsServiceImpl extends ServiceImpl queryByPage(SarStandAttrDetailsEOPage page){ + Integer pageCount = dao.queryByCount(page); + page.getPager().setRowCount(pageCount); return dao.queryByPage(page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java index 38050470..09a2baae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/controller/SarStandAttrInfoController.java @@ -17,7 +17,7 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|SarStandAttrInfo|") -@RequestMapping("/SarStandAttrInfo/sar-stand-attr-info") +@RequestMapping("/${restPath}/SarStandAttrInfo/sar-stand-attr-info") public class SarStandAttrInfoController extends BaseController { } 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 1745781a..7ef6ef5f 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 @@ -13,11 +13,11 @@ import lombok.experimental.Accessors; /** *

- * + * *

* * @author super_liu - * @since 2021-06-01 + * @since 2021-06-16 */ @Data @EqualsAndHashCode(callSuper = true) @@ -48,60 +48,32 @@ public class SarStandAttrInfo extends BaseEntity { @ApiModelProperty(value = "修改时间") @TableField("MODIFY_TIME") - private Date modifyTime; + private LocalDateTime modifyTime; @ApiModelProperty(value = "归口管理部门") @TableField("GKDW") private String gkdw; - @ApiModelProperty(value = "起草单位") - @TableField("FBJG") - private String fbjg; - @ApiModelProperty(value = "我司参与深度") @TableField("CYSD") private String cysd; - @ApiModelProperty(value = "新车型实施日期(标准文本）") + @ApiModelProperty(value = "新车型实施日期（文本）") @TableField("XCXSSRQ") private String xcxssrq; - @ApiModelProperty(value = "在产车实施日期(标准文本）") + @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; - + @ApiModelProperty(value = "标签") @TableField("GXHBQ") private String gxhbq; - @TableField("XGBM") - private String xgbm; - + @ApiModelProperty(value = "中国认证类型") @TableField("ZGRZLX") private String zgrzlx; - @TableField("GZZXX") - private String gzzxx; - - @TableField("FO") - private String fo; - - @TableField("XMPGJS") - private String xmpgjs; - - @TableField("SVPPS") - private String svpps; - @ApiModelProperty(value = "草案") @TableField("CA") private String ca; @@ -118,13 +90,15 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("BPG") private String bpg; + @ApiModelProperty(value = "采购部门") @TableField("CGBM") private String cgbm; - @ApiModelProperty(value = "发布稿") + @ApiModelProperty(value = "发布稿（必读）") @TableField("FBGBJBD") private String fbgbjbd; + @ApiModelProperty(value = "增补件（必读）") @TableField("ZBJBD") private String zbjbd; @@ -132,10 +106,11 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("ZRBM") private String zrbm; + @ApiModelProperty(value = "法规维护人") @TableField("FGWHR") private String fgwhr; - @ApiModelProperty(value = "代替标准编号") + @ApiModelProperty(value = "代替标准号") @TableField("DTBJH") private String dtbjh; @@ -168,37 +143,9 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("CBCD") private String cbcd; - @TableField("ZRLX") - private String zrlx; - - @TableField("YQLX") - private String yqlx; - - @TableField("XXZLXX") - private String xxzlxx; - @TableField("NRDBZFGQD") private String nrdbzfgqd; - @TableField("FGXXSXXX") - private String fgxxsxxx; - - @TableField("DXBZ") - private String dxbz; - - @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; @@ -207,6 +154,14 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("SSRQGJ") private String ssrqgj; + @ApiModelProperty(value = "新车型实施日期(国家）") + @TableField("XCXSSRQGJ") + private String xcxssrqgj; + + @ApiModelProperty(value = "在产车实施日期(国家）") + @TableField("ZCCSSRQGJ") + private String zccssrqgj; + @ApiModelProperty(value = "修改单") @TableField("XGD") private String xgd; @@ -215,6 +170,10 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("JDWJ") private String jdwj; + @ApiModelProperty(value = "关联文件") + @TableField("GLWJ") + private String glwj; + @ApiModelProperty(value = "我司署名人") @TableField("WSSMR") private String wssmr; @@ -228,26 +187,18 @@ public class SarStandAttrInfo extends BaseEntity { private String sycpx; @ApiModelProperty(value = "适用认证") - @TableField("SYRZ") - private String syrz; + @TableField("SYZD") + private String syzd; @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编码") + @ApiModelProperty(value = "关联模块--卡车VPPS编码") @TableField("KCCVPPSBM") private String kccvppsbm; - @ApiModelProperty(value = "卡车VPPS中文名称") + @ApiModelProperty(value = "关联模块--卡车vpps中文名称") @TableField("KCCVPPSCN") private String kccvppscn; @@ -259,11 +210,21 @@ public class SarStandAttrInfo extends BaseEntity { @TableField("DYMC") private String dymc; - @ApiModelProperty(value = "关联文件") - @TableField("GLWJ") - private String glwj; + @ApiModelProperty(value = "关联模块--乘用车VPPS编码") + @TableField("CYCVPPSBM") + private String cycvppsbm; - // -- end + @ApiModelProperty(value = "关联模块--乘用车vpps中文名称") + @TableField("CYCVPPSCN") + private String cycvppscn; + + @ApiModelProperty(value = "勘误件") + @TableField("KWJ") + private String kwj; + + @ApiModelProperty(value = "体系类别") + @TableField("TXLB") + private String txlb; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java index a105fe12..93f94b8e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java @@ -1,12 +1,25 @@ package com.adc.da.slrs.sarStandMenu.controller; +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.sarStandMenu.service.ISarStandMenuService; +import com.adc.da.util.UUIDUtils; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; +import java.util.List; + /** *

* 前端控制器 @@ -17,7 +30,51 @@ import com.adc.da.base.web.BaseController; */ @RestController @Api(description = "|SarStandMenu|") -@RequestMapping("/SarStandMenu/sar-stand-menu") +@RequestMapping("/${restPath}/lawss/sarStandMenu") public class SarStandMenuController extends BaseController { + @Autowired + private ISarStandMenuService sarStandMenuEOService; + + @Autowired + private ISarMenuService sarMenuEOService; + + @ApiOperation(value = "|SarStandMenuEO|修改") + @PutMapping("/removeStandInfo") +// @RequiresPermissions("lawss:sarStandMenu:update") + public ResponseMessage update(@RequestBody SarStandMenu standardsInfoEO) throws Exception { + String[] idList = standardsInfoEO.getIdlist(); + int count = 0; + if(idList != null){ + for(String id : idList){ + SarStandMenu menuEO = new SarStandMenu(); + menuEO.setStandId(id); + menuEO.setMenuId(standardsInfoEO.getMenuId()); + //删除所选目录下关联 + String oldMenuId = standardsInfoEO.getOldMenuId(); + if (StringUtils.isEmpty(oldMenuId)) { + oldMenuId = standardsInfoEO.getMenuId(); + } + menuEO.setOldMenuId(oldMenuId); + count += sarStandMenuEOService.deleteByMenuId(menuEO); + //查询是否还有与其他节点的关联，若没有则增加与根节点的关联 + List getList = sarStandMenuEOService.selectAllMenuByStandId(menuEO); + if (getList == null || getList.isEmpty()) { + // 查询根节点 + SarMenu sarMenuEO = new SarMenu(); + sarMenuEO.setSorDivide(standardsInfoEO.getStandType() + "_STAND"); + List getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO); + menuEO.setMenuId(getRootMenu.get(0).getId()); + menuEO.setId(UUIDUtils.randomUUID20()); + menuEO.setValidFlag(0); + sarStandMenuEOService.saveOrUpdate(menuEO); + } + } + } + if(count>0){ + return Result.success("0","移除成功！",true); + } else { + return Result.error("移除失败!"); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java index 77819729..1c400103 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java @@ -24,4 +24,9 @@ public interface SarStandMenuDao extends BaseMapper { int updateByStandIdAndMenuId(SarStandMenu sarStandMenuEO); int deleteByStandIdAndMenuId(SarStandMenu sarStandMenuEO); + + int deleteByMenuId (SarStandMenu sarStandMenuEO); + + List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java index dedace0e..c96f9818 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandMenu.service; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +15,8 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ISarStandMenuService extends IService { + int deleteByMenuId (SarStandMenu sarStandMenuEO); + + List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java index 29a3e62a..e05feb25 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java @@ -1,11 +1,15 @@ package com.adc.da.slrs.sarStandMenu.service.impl; +import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 服务实现类 @@ -17,4 +21,22 @@ import org.springframework.stereotype.Service; @Service public class SarStandMenuServiceImpl extends ServiceImpl implements ISarStandMenuService { + @Autowired + private SarStandMenuDao dao; + + @Autowired + private ISarMenuService sarMenuEOService; + + @Override + public int deleteByMenuId (SarStandMenu sarStandMenuEO){ + List menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId()); + sarStandMenuEO.setMenuIds(menuIds); + return dao.deleteByMenuId(sarStandMenuEO); + } + + @Override + public List selectAllMenuByStandId(SarStandMenu sarStandMenuEO){ + return dao.selectAllMenuByStandId(sarStandMenuEO); + } + } 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 8cc07aef..7e4f80fd 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 @@ -124,6 +124,16 @@ 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) private String collectId; // 收藏表ID @@ -178,3 +188,4 @@ public class SarStandardsInfo extends BaseEntity { private String putTime2; } + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java index f37d5ea0..6ae9b575 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/controller/UtAreaController.java @@ -43,4 +43,59 @@ public class UtAreaController extends BaseController { return Result.success(utAreaEOService.getAreaSelList(utAreaEO)); } + @ApiOperation(value = "|UtAreaEO|分页查询") + @GetMapping("/page") +// @RequiresPermissions("lawssBase:utArea:page") + public ResponseMessage> page(UtAreaEOPage page) throws Exception { + List rows = utAreaEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|UtAreaEO|查询") + @GetMapping("/list") +// @RequiresPermissions("lawssBase:utArea:list") + public ResponseMessage> list(UtAreaEOPage page) throws Exception { + return Result.success(utAreaEOService.queryByList(page)); + } + + @ApiOperation(value = "|UtAreaEO|详情") + @GetMapping("/getById") +// @RequiresPermissions("lawssBase:utArea:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(utAreaEOService.getById(id)); + } + + @ApiOperation(value = "|UtAreaEO|新增") + @PostMapping("/createUtArea") +// @RequiresPermissions("lawssBase:utArea:save") + public ResponseMessage create(@RequestBody UtArea utAreaEO) throws Exception { + String result = utAreaEOService.createUtArea(utAreaEO); + if ("success".equals(result)) { + return Result.success("0","新增成功",utAreaEO); + } else { + return Result.error("0",result,utAreaEO); + } + } + + @ApiOperation(value = "|UtAreaEO|修改") + @PutMapping("/updateUtArea") +// @RequiresPermissions("lawssBase:utArea:update") + public ResponseMessage update(@RequestBody UtArea utAreaEO) throws Exception { + String result = utAreaEOService.updateUtArea(utAreaEO); + if ("success".equals(result)) { + return Result.success("0","修改成功",utAreaEO); + } else { + return Result.error("0",result,utAreaEO); + } + } + + @ApiOperation(value = "|UtAreaEO|删除") + @DeleteMapping("/deleteById") +// @RequiresPermissions("lawssBase:utArea:delete") + public ResponseMessage delete(String id) throws Exception { + utAreaEOService.removeById(id); + logger.info("delete from UT_AREA where id = {}", id); + return Result.success(); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java index fbdce2ae..a7a19747 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/dao/UtAreaDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.utArea.dao; import com.adc.da.slrs.utArea.entity.UtArea; +import com.adc.da.slrs.utArea.page.UtAreaEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -16,6 +17,15 @@ import java.util.List; */ public interface UtAreaDao extends BaseMapper { + Integer queryByCount(UtAreaEOPage page); + + List queryByPage(UtAreaEOPage page); + + List queryByList(UtAreaEOPage page); + + + + List getAreaSelList(UtArea utAreaEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java index 5946dd41..64267ff5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/IUtAreaService.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.utArea.service; import com.adc.da.slrs.utArea.entity.UtArea; +import com.adc.da.slrs.utArea.page.UtAreaEOPage; import com.adc.da.sys.common.SelectionResult; import com.baomidou.mybatisplus.extension.service.IService; @@ -17,4 +18,12 @@ import java.util.List; public interface IUtAreaService extends IService { List getAreaSelList(UtArea utAreaEO); + + List queryByPage(UtAreaEOPage page); + + List queryByList(UtAreaEOPage page); + + String createUtArea(UtArea utAreaEO); + + String updateUtArea(UtArea utAreaEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java index a33f5b8c..f7dda383 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/utArea/service/impl/UtAreaServiceImpl.java @@ -2,14 +2,18 @@ package com.adc.da.slrs.utArea.service.impl; import com.adc.da.slrs.utArea.entity.UtArea; import com.adc.da.slrs.utArea.dao.UtAreaDao; +import com.adc.da.slrs.utArea.page.UtAreaEOPage; import com.adc.da.slrs.utArea.service.IUtAreaService; import com.adc.da.sys.common.SelectionResult; +import com.adc.da.util.LoginUserUtil; +import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -36,4 +40,57 @@ public class UtAreaServiceImpl extends ServiceImpl implements return dao.getAreaSelList(utAreaEO); } + @Override + public List queryByPage(UtAreaEOPage page){ + Integer rowCount = dao.queryByCount(page); + page.getPager().setRowCount(rowCount); + return dao.queryByPage(page); + } + + @Override + public List queryByList(UtAreaEOPage page){ + return dao.queryByList(page); + } + + public String createUtArea (UtArea utAreaEO) { + // 判断名称是否已存在 + UtAreaEOPage page = new UtAreaEOPage(); + page.setAreaName(utAreaEO.getAreaName()); + page.setSarType(utAreaEO.getSarType()); + List getList = dao.queryByList(page); + if (getList != null && !getList.isEmpty()) { + return "新增失败，展示区域名称已存在"; + } + utAreaEO.setId(UUIDUtils.randomUUID20()); + utAreaEO.setCreationUser(LoginUserUtil.getUserId()); + utAreaEO.setCreationTime(new Date()); + utAreaEO.setModifyTime(new Date()); + utAreaEO.setValidFlag(0); + int result = dao.insert(utAreaEO); + if (result > 0) { + return "success"; + } else { + return "新增失败"; + } + } + + public String updateUtArea (UtArea utAreaEO) { + // 判断名称是否已存在 + UtAreaEOPage page = new UtAreaEOPage(); + page.setAreaName(utAreaEO.getAreaName()); + page.setSarType(utAreaEO.getSarType()); + page.setNotId(utAreaEO.getId()); + List getList = dao.queryByList(page); + if (getList != null && !getList.isEmpty()) { + return "修改失败，展示区域名称已存在"; + } + utAreaEO.setModifyTime(new Date()); + int result = dao.updateById(utAreaEO); + if (result > 0) { + return "success"; + } else { + return "修改失败"; + } + } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index fa86543d..0425a16a 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -68,4 +68,19 @@ where stand_id = #{standId, jdbcType=VARCHAR} and MENU_ID = #{menuId, jdbcType=VARCHAR} + + delete from SAR_STAND_MENU + where stand_id = #{standId} + and MENU_ID in + + #{item} + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml index 244b64db..133832f0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml @@ -65,6 +65,122 @@ + + + + insert into UT_AREA() + values (#{id, jdbcType=VARCHAR}, #{areaName, jdbcType=VARCHAR}, #{showIndex, jdbcType=INTEGER}, #{sarType, jdbcType=VARCHAR}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) + + + + + + insert into UT_AREA + + id, + area_name, + show_index, + sar_type, + creation_user, + valid_flag, + creation_time, + modify_time, + + + #{id, jdbcType=VARCHAR}, + #{areaName, jdbcType=VARCHAR}, + #{showIndex, jdbcType=INTEGER}, + #{sarType, jdbcType=VARCHAR}, + #{creationUser, jdbcType=VARCHAR}, + #{validFlag, jdbcType=INTEGER}, + #{creationTime, jdbcType=TIMESTAMP}, + #{modifyTime, jdbcType=TIMESTAMP}, + + + + + + update UT_AREA + set area_name = #{areaName}, + show_index = #{showIndex}, + sar_type = #{sarType}, + creation_user = #{creationUser}, + valid_flag = #{validFlag}, + creation_time = #{creationTime}, + modify_time = #{modifyTime} + where id = #{id} + + + + + update UT_AREA + + + area_name = #{areaName}, + + + show_index = #{showIndex}, + + + sar_type = #{sarType}, + + + creation_user = #{creationUser}, + + + valid_flag = #{validFlag}, + + + creation_time = #{creationTime}, + + + modify_time = #{modifyTime}, + + + where id = #{id} + + + + + + + + delete from UT_AREA + where id = #{value} + + + + + + + + + + + select from - (select tmp_tb.* , rownum rn from + (select tmp_tb.* from (select from TS_DICTIONARY u0 - order by order_num,u0.id - ) tmp_tb where rownum <= ${pager.endIndex}) - where rn >= ${pager.startIndex} + + ORDER BY ${sql} + + ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a