From de5193c5f94d8dbdc718b99fa5849f67deabebb0 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 1 Jul 2022 15:08:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 23 ++++ ...ollectManifestUserTypeLogEOController.java | 72 ++++++++++++ .../ParamsCollectManifestUserTypeLogEO.java | 84 ++++++++++++++ ...amsCollectManifestUserTypeLogEOMapper.java | 17 +++ ...ramsCollectManifestUserTypeLogEOMapper.xml | 16 +++ ...msCollectManifestUserTypeLogEOService.java | 63 +++++++++++ ...llectManifestUserTypeLogEOServiceImpl.java | 105 ++++++++++++++++++ 7 files changed, 380 insertions(+) create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 7c71b2f41..5c2857e32 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -93,3 +93,26 @@ ALTER TABLE `laws_weilai`.`params_report` `file_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件id', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- 参数清单表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_manifest` + MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`; + +-- 参数清单历史版本表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_manifest_history` + MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`; + +-- 参数项收集切换角色日志表 +CREATE TABLE `params_collect_manifest_user_type_log` ( + `id` varchar(36) NOT NULL, + `create_by` varchar(50) DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门', + `project_id` varchar(50) DEFAULT NULL COMMENT '项目id', + `params_manifest_id` varchar(50) DEFAULT NULL COMMENT '参数清单id', + `user_id` varchar(50) DEFAULT NULL COMMENT '用户id', + `user_type` varchar(50) DEFAULT NULL COMMENT '用户类型', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java new file mode 100644 index 000000000..884aa0fb7 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestUserTypeLogEOController.java @@ -0,0 +1,72 @@ +package com.jero.modules.cert.collect.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO; +import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 参数项收集切换角色日志表 + * @Author: jero-boot + * @Date: 2022-07-01 + * @Version: V1.0 + */ +@Api(tags="参数项收集切换角色日志表") +@RestController +@RequestMapping("/params/userTypeLog") +@Slf4j +public class ParamsCollectManifestUserTypeLogEOController extends JeroController { + @Autowired + private IParamsCollectManifestUserTypeLogEOService paramsCollectManifestUserTypeLogEOService; + + + /** + * 编辑 + * + * @param paramsCollectManifestUserTypeLogEO + * @return + */ + @AutoLog(value = "参数项收集切换角色日志表-编辑") + @ApiOperation(value="参数项收集切换角色日志表-编辑", notes="参数项收集切换角色日志表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) { + paramsCollectManifestUserTypeLogEOService.editById(paramsCollectManifestUserTypeLogEO); + return Result.OK("编辑成功!"); + } + + + + /** + * 通过id查询 + * + * @param + * @return + */ + @AutoLog(value = "参数项收集切换角色日志表-查询当前用户类型") + @ApiOperation(value="参数项收集切换角色日志表-查询当前用户类型", notes="参数项收集切换角色日志表-查询当前用户类型") + @GetMapping(value = "/queryCurrentType") + public Result queryById(@RequestParam(name="projectId",required=true) String projectId, + @RequestParam(name="paramsManifestId",required=true) String paramsManifestId, + @RequestParam(name="userId",required=true) String userId) { + ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO = paramsCollectManifestUserTypeLogEOService.queryCurrentType(projectId,paramsManifestId,userId); + return Result.OK(paramsCollectManifestUserTypeLogEO); + } + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java new file mode 100644 index 000000000..4cc47bb7c --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestUserTypeLogEO.java @@ -0,0 +1,84 @@ +package com.jero.modules.cert.collect.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 参数项收集切换角色日志表 + * @Author: jero-boot + * @Date: 2022-07-01 + * @Version: V1.0 + */ +@Data +@TableName("params_collect_manifest_user_type_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="params_collect_manifest_user_type_log对象", description="参数项收集切换角色日志表") +public class ParamsCollectManifestUserTypeLogEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private String projectId; + + /**参数清单id*/ + @Excel(name = "参数清单id", width = 15) + @ApiModelProperty(value = "参数清单id") + private String paramsManifestId; + + /**用户id*/ + @Excel(name = "用户id", width = 15) + @ApiModelProperty(value = "用户id") + private String userId; + + /**用户类型*/ + @Excel(name = "用户类型", width = 15) + @ApiModelProperty(value = "用户类型") + private String userType; + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java new file mode 100644 index 000000000..578169942 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestUserTypeLogEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.cert.collect.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 参数项收集切换角色日志表 + * @Author: jero-boot + * @Date: 2022-07-01 + * @Version: V1.0 + */ +public interface ParamsCollectManifestUserTypeLogEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml new file mode 100644 index 000000000..d6377cb57 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestUserTypeLogEOMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java new file mode 100644 index 000000000..dc11ba8e2 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestUserTypeLogEOService.java @@ -0,0 +1,63 @@ +package com.jero.modules.cert.collect.service; + +import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 参数项收集切换角色日志表 + * @Author: jero-boot + * @Date: 2022-07-01 + * @Version: V1.0 + */ +public interface IParamsCollectManifestUserTypeLogEOService extends IService { + + /** + * 保存 + * + * @param paramsCollectManifestUserTypeLogEO + * @return + */ + void add(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO); + + /** + * 更新 + * + * @param paramsCollectManifestUserTypeLogEO + * @return + */ + void editById(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ParamsCollectManifestUserTypeLogEO queryById(String id); + + ParamsCollectManifestUserTypeLogEO queryCurrentType(String projectId, String paramsManifestId, String userId); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java new file mode 100644 index 000000000..9d34288d8 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestUserTypeLogEOServiceImpl.java @@ -0,0 +1,105 @@ +package com.jero.modules.cert.collect.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO; +import com.jero.modules.cert.collect.mapper.ParamsCollectManifestUserTypeLogEOMapper; +import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 参数项收集切换角色日志表 + * @Author: jero-boot + * @Date: 2022-07-01 + * @Version: V1.0 + */ +@Service +public class ParamsCollectManifestUserTypeLogEOServiceImpl extends ServiceImpl implements IParamsCollectManifestUserTypeLogEOService { + + /** + * 保存 + * + * @param paramsCollectManifestUserTypeLogEO + * @return + */ + @Override + public void add(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) { + Date now = new Date(); + paramsCollectManifestUserTypeLogEO.setCreateTime(now); + paramsCollectManifestUserTypeLogEO.setUpdateTime(now); + save(paramsCollectManifestUserTypeLogEO); + } + + /** + * 更新 + * + * @param paramsCollectManifestUserTypeLogEO + * @return + */ + @Override + public void editById(ParamsCollectManifestUserTypeLogEO paramsCollectManifestUserTypeLogEO) { + Date now = new Date(); + paramsCollectManifestUserTypeLogEO.setUpdateTime(now); + saveOrUpdate(paramsCollectManifestUserTypeLogEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ParamsCollectManifestUserTypeLogEO queryById(String id) { + return getById(id); + } + + @Override + public ParamsCollectManifestUserTypeLogEO queryCurrentType(String projectId, String paramsManifestId, String userId) { + ParamsCollectManifestUserTypeLogEO result = new ParamsCollectManifestUserTypeLogEO(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsCollectManifestUserTypeLogEO::getProjectId, projectId) + .eq(ParamsCollectManifestUserTypeLogEO::getParamsManifestId, paramsManifestId) + .eq(ParamsCollectManifestUserTypeLogEO::getUserId, userId); + List resultList = list(queryWrapper); + if(CollectionUtils.isNotEmpty(resultList)){ + result = resultList.get(0); + } + return result; + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +}