From 467697f78bf5c953a81a978e5f2e67737de45569 Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期一, 04 三月 2024 18:32:24 +0800 Subject: [PATCH] 标准库开发 --- cnas-server/src/main/java/com/yuanchu/mom/service/StandardMethodService.java | 22 ++ cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java | 24 +++ cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java | 40 +++++ cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java | 52 ++++++ cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java | 76 +++++++++ inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 28 +++ cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 2 cnas-server/src/main/resources/mapper/StandardMethodMapper.xml | 41 +++++ inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java | 22 ++ inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java | 84 ++++++++++ inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java | 45 +++++ inspect-server/src/main/java/com/yuanchu/mom/service/StandardMethodListService.java | 15 + inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 15 + 13 files changed, 466 insertions(+), 0 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java new file mode 100644 index 0000000..fb027b6 --- /dev/null +++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/StandardMethodController.java @@ -0,0 +1,40 @@ +package com.yuanchu.mom.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.annotation.ValueAuth; +import com.yuanchu.mom.pojo.StandardMethod; +import com.yuanchu.mom.service.StandardMethodService; +import com.yuanchu.mom.utils.JackSonUtil; +import com.yuanchu.mom.vo.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.Value; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@Api("鏍囧噯鏂规硶") +@RestController +@RequestMapping("/standardMethod") +@AllArgsConstructor +public class StandardMethodController { + + private StandardMethodService standardMethodService; + + @ApiOperation(value = "鑾峰彇鏍囧噯鏂规硶鍒楄〃") + @PostMapping("/selectStandardMethodList") + public Result selectStandardMethodList(@RequestBody Map<String, Object> data) throws Exception { + Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); + StandardMethod standardMethod = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), StandardMethod.class); + return Result.success(standardMethodService.selectStandardMethodList(page, standardMethod)); + } + + @ApiOperation(value = "鑾峰彇鏍囧噯鏂规硶鏋氫妇") + @GetMapping("/selectStandardMethods") + @ValueAuth + public Result selectStandardMethods(){ + return Result.success(standardMethodService.selectStandardMethods()); + } + +} diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java new file mode 100644 index 0000000..999f1e8 --- /dev/null +++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodMapper.java @@ -0,0 +1,24 @@ +package com.yuanchu.mom.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.pojo.StandardMethod; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yuanchu.mom.pojo.StructureItemParameter; + +/** +* @author Administrator +* @description 閽堝琛ㄣ�恠tandard_method(鏍囧噯鏂规硶)銆戠殑鏁版嵁搴撴搷浣淢apper +* @createDate 2024-03-03 19:21:41 +* @Entity com.yuanchu.mom.pojo.StandardMethod +*/ +public interface StandardMethodMapper extends BaseMapper<StandardMethod> { + + IPage<StandardMethod> selectStandardMethodList(Page page, QueryWrapper<StandardMethod> ew); + +} + + + + diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java new file mode 100644 index 0000000..14017d4 --- /dev/null +++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StandardMethod.java @@ -0,0 +1,76 @@ +package com.yuanchu.mom.pojo; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yuanchu.mom.annotation.ValueTableShow; +import com.yuanchu.mom.common.OrderBy; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 鏍囧噯鏂规硶 + * @TableName standard_method + */ +@TableName(value ="standard_method") +@Data +public class StandardMethod extends OrderBy implements Serializable { + /** + * + */ + @TableId(type = IdType.AUTO) + private Integer id; + + /** + * 鏍囧噯缂栧彿 + */ + @ValueTableShow(1) + @ApiModelProperty(value = "鏍囧噯缂栧彿") + private String code; + + /** + * 鏍囧噯鏂规硶 + */ + @ValueTableShow(2) + @ApiModelProperty(value = "鏍囧噯鏂规硶") + private String name; + + /** + * 澶囨敞 + */ + @ValueTableShow(3) + @ApiModelProperty(value = "澶囨敞") + private String remark; + + @ApiModelProperty(value = "鍒涘缓浜篿d") + @TableField(fill = FieldFill.INSERT) + private Integer createUser; + + @ApiModelProperty(value = "淇敼浜篿d") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Integer updateUser; + + @ValueTableShow(4) + @ApiModelProperty(value = "鍒涘缓浜�") + private String createUserName; + + @ValueTableShow(6) + @ApiModelProperty(value = "鏇存柊浜�") + private String updateUserName; + + @ValueTableShow(5) + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + @ValueTableShow(7) + @ApiModelProperty(value = "鏇存柊鏃堕棿") + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} \ No newline at end of file diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java index dec42e6..2a07001 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java @@ -104,11 +104,13 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ValueTableShow(14) private LocalDateTime createTime; @ApiModelProperty(value = "淇敼鏃堕棿") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ValueTableShow(15) private LocalDateTime updateTime; } diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/StandardMethodService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/StandardMethodService.java new file mode 100644 index 0000000..4708ff0 --- /dev/null +++ b/cnas-server/src/main/java/com/yuanchu/mom/service/StandardMethodService.java @@ -0,0 +1,22 @@ +package com.yuanchu.mom.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yuanchu.mom.pojo.StandardMethod; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yuanchu.mom.pojo.StructureItemParameter; + +import java.util.List; +import java.util.Map; + +/** +* @author Administrator +* @description 閽堝琛ㄣ�恠tandard_method(鏍囧噯鏂规硶)銆戠殑鏁版嵁搴撴搷浣淪ervice +* @createDate 2024-03-03 19:21:41 +*/ +public interface StandardMethodService extends IService<StandardMethod> { + + Map<String, Object> selectStandardMethodList(Page page, StandardMethod standardMethod); + + List<StandardMethod> selectStandardMethods(); + +} diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java new file mode 100644 index 0000000..462cae1 --- /dev/null +++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodServiceImpl.java @@ -0,0 +1,52 @@ +package com.yuanchu.mom.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yuanchu.mom.common.GetLook; +import com.yuanchu.mom.common.PrintChina; +import com.yuanchu.mom.pojo.StandardMethod; +import com.yuanchu.mom.pojo.StructureItemParameter; +import com.yuanchu.mom.service.StandardMethodService; +import com.yuanchu.mom.mapper.StandardMethodMapper; +import com.yuanchu.mom.utils.QueryWrappers; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** +* @author Administrator +* @description 閽堝琛ㄣ�恠tandard_method(鏍囧噯鏂规硶)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 +* @createDate 2024-03-03 19:21:41 +*/ +@Service +@AllArgsConstructor +public class StandardMethodServiceImpl extends ServiceImpl<StandardMethodMapper, StandardMethod> + implements StandardMethodService{ + + private GetLook getLook; + + private StandardMethodMapper standardMethodMapper; + + @Override + public Map<String, Object> selectStandardMethodList(Page page, StandardMethod standardMethod) { + Map<String, Object> map = new HashMap<>(); + map.put("head", PrintChina.printChina(StandardMethod.class)); + Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectStandardMethodList"); + if(map1.get("look")==1) standardMethod.setCreateUser(map1.get("userId")); + map.put("body", standardMethodMapper.selectStandardMethodList(page, QueryWrappers.queryWrappers(standardMethod))); + return map; + } + + @Override + public List<StandardMethod> selectStandardMethods() { + return standardMethodMapper.selectList(Wrappers.<StandardMethod>lambdaQuery().select(StandardMethod::getId,StandardMethod::getCode,StandardMethod::getName)); + } +} + + + + diff --git a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml new file mode 100644 index 0000000..bbb7fcb --- /dev/null +++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.yuanchu.mom.mapper.StandardMethodMapper"> + + <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardMethod"> + <id property="id" column="id" jdbcType="INTEGER"/> + <result property="code" column="code" jdbcType="VARCHAR"/> + <result property="name" column="name" jdbcType="VARCHAR"/> + <result property="remark" column="remark" jdbcType="VARCHAR"/> + <result property="createUser" column="create_user" jdbcType="INTEGER"/> + <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> + <result property="updateUser" column="update_user" jdbcType="INTEGER"/> + <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> + </resultMap> + + <sql id="Base_Column_List"> + id,code,name, + remark,create_user,create_time, + update_user,update_time + </sql> + <select id="selectStandardMethodList" resultType="com.yuanchu.mom.pojo.StandardMethod"> + select * from ( + select sm.id, + sm.code, + sm.name, + sm.remark, + u1.name create_user_name, + sm.create_time, + u2.name update_user_name, + sm.update_time + from standard_method sm + left join user u1 on sm.create_user = u1.id + left join user u2 on sm.update_user = u2.id + ) a + <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> + ${ew.customSqlSegment} + </if> + </select> +</mapper> diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java index 0afdd07..7af0d43 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.ObjectUtil; import com.yuanchu.mom.pojo.StandardTree; +import com.yuanchu.mom.service.StandardMethodListService; import com.yuanchu.mom.service.StandardTreeService; import com.yuanchu.mom.vo.Result; import io.swagger.annotations.ApiOperation; @@ -15,6 +16,8 @@ private StandardTreeService standardTreeService; + private StandardMethodListService standardMethodListService; + @ApiOperation(value = "鑾峰彇鏍囧噯鏍�") @GetMapping("/selectStandardTreeList") public Result selectStandardTreeList(){ @@ -28,4 +31,16 @@ return Result.success(standardTreeService.addStandardTree(standardTree)); } + @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�") + @PostMapping("/addStandardMethodList") + public Result addStandardMethodList(String tree, Integer standardId){ + return Result.success(standardMethodListService.addStandardMethodList(standardId, tree)); + } + + @ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�") + @PostMapping("/selectsStandardMethodByFLSSM") + public Result selectsStandardMethodByFLSSM(){ + return Result.success(); + } + } diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java new file mode 100644 index 0000000..cf36313 --- /dev/null +++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardMethodListMapper.java @@ -0,0 +1,22 @@ +package com.yuanchu.mom.mapper; + +import com.yuanchu.mom.pojo.StandardMethodList; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.Map; + +/** +* @author Administrator +* @description 閽堝琛ㄣ�恠tandard_method_list(鏍囧噯鏍戜笅鐨勬爣鍑嗗垪琛�)銆戠殑鏁版嵁搴撴搷浣淢apper +* @createDate 2024-03-04 13:44:04 +* @Entity com.yuanchu.mom.pojo.StandardMethodList +*/ +public interface StandardMethodListMapper extends BaseMapper<StandardMethodList> { + + Map<String, String> selectStandardMethodById(Integer id); + +} + + + + diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java new file mode 100644 index 0000000..d966b44 --- /dev/null +++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardMethodList.java @@ -0,0 +1,84 @@ +package com.yuanchu.mom.pojo; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yuanchu.mom.annotation.ValueTableShow; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +/** + * 鏍囧噯鏍戜笅鐨勬爣鍑嗗垪琛� + * @TableName standard_method_list + */ +@TableName(value ="standard_method_list") +@Data +public class StandardMethodList implements Serializable { + /** + * + */ + @TableId(type = IdType.AUTO) + private Integer id; + + /** + * 鏍囧噯缂栧彿 + */ + @ApiModelProperty("鏍囧噯缂栧彿") + private String code; + + /** + * 鏍囧噯鍚嶇О + */ + @ApiModelProperty("鏍囧噯绉板彿") + private String name; + + /** + * 澶囨敞 + */ + @ApiModelProperty("澶囨敞") + private String remark; + + @ApiModelProperty("宸ュ巶") + private String factory; + + @ApiModelProperty("瀹為獙瀹�") + private String laboratory; + + @ApiModelProperty("鏍峰搧鍒嗙被") + private String sample_type; + + @ApiModelProperty("鏍峰搧") + private String sample; + + @ApiModelProperty("鍨嬪彿") + private String model; + + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) + private Integer createUser; + /** + * + */ + @ApiModelProperty("鍒涘缓鏃堕棿") + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + /** + * + */ + @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Integer updateUser; + /** + * + */ + @ApiModelProperty("淇敼鏃堕棿") + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; +} \ No newline at end of file diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardMethodListService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardMethodListService.java new file mode 100644 index 0000000..ed102b8 --- /dev/null +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardMethodListService.java @@ -0,0 +1,15 @@ +package com.yuanchu.mom.service; + +import com.yuanchu.mom.pojo.StandardMethodList; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 閽堝琛ㄣ�恠tandard_method_list(鏍囧噯鏍戜笅鐨勬爣鍑嗗垪琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice +* @createDate 2024-03-04 13:44:04 +*/ +public interface StandardMethodListService extends IService<StandardMethodList> { + + int addStandardMethodList(Integer standardId, String tree); + +} diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java new file mode 100644 index 0000000..839d1ca --- /dev/null +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardMethodListServiceImpl.java @@ -0,0 +1,45 @@ +package com.yuanchu.mom.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yuanchu.mom.pojo.StandardMethodList; +import com.yuanchu.mom.service.StandardMethodListService; +import com.yuanchu.mom.mapper.StandardMethodListMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** +* @author Administrator +* @description 閽堝琛ㄣ�恠tandard_method_list(鏍囧噯鏍戜笅鐨勬爣鍑嗗垪琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 +* @createDate 2024-03-04 13:44:04 +*/ +@Service +@AllArgsConstructor +public class StandardMethodListServiceImpl extends ServiceImpl<StandardMethodListMapper, StandardMethodList> + implements StandardMethodListService{ + + private StandardMethodListMapper standardMethodListMapper; + + @Override + public int addStandardMethodList(Integer standardId, String tree) { + String[] trees = tree.split(" - "); + Map<String, String> map = standardMethodListMapper.selectStandardMethodById(standardId); + StandardMethodList list = new StandardMethodList(); + list.setCode(map.get("code")); + list.setName(map.get("name")); + list.setRemark(map.get("remark")); + list.setFactory(trees[0]); + list.setLaboratory(trees[1]); + list.setSample_type(trees[2]); + list.setSample(trees[3]); + try { + list.setModel(trees[4]); + }catch (Exception e){} + return standardMethodListMapper.insert(list); + } +} + + + + diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml new file mode 100644 index 0000000..c92b378 --- /dev/null +++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.yuanchu.mom.mapper.StandardMethodListMapper"> + + <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardMethodList"> + <id property="id" column="id" jdbcType="INTEGER"/> + <result property="code" column="code" jdbcType="VARCHAR"/> + <result property="name" column="name" jdbcType="VARCHAR"/> + <result property="remark" column="remark" jdbcType="VARCHAR"/> + <result property="standardTreeId" column="standard_tree_id" jdbcType="INTEGER"/> + <result property="createUser" column="create_user" jdbcType="INTEGER"/> + <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> + <result property="updateUser" column="update_user" jdbcType="INTEGER"/> + <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> + </resultMap> + + <sql id="Base_Column_List"> + id,code,name, + remark,standard_tree_id,create_user, + create_time,update_user,update_time + </sql> + <select id="selectStandardMethodById" resultType="java.util.Map"> + select code,name,remark from standard_method + where id = #{id} + </select> +</mapper> -- Gitblit v1.9.3