From e06fe535194cb73db903548f0e0750f508ebe5aa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 09 八月 2023 17:56:33 +0800
Subject: [PATCH] 基础数据工序8.9
---
standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml | 26 +++++-
standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java | 29 +++++++
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 3
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 3
sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 18 +---
standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java | 3
standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo1.java | 18 ++++
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java | 10 +-
standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java | 49 ++++++++++--
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java | 40 +++++++++
standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo2.java | 34 ++++++++
11 files changed, 196 insertions(+), 37 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
index 3eeed10..70b202e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -4,6 +4,7 @@
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.*;
+import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.*;
@@ -106,12 +107,9 @@
@ApiOperation(value = "鏂板妫�楠屽崟")
@PostMapping("/addRawInspects")
- public Result addRawInspects(@RequestHeader("token") String token, @RequestBody RawInspect rawInspect) throws JSONException {
- Map<String, String> map = jwt.readJWT(token);
- String data = map.get("data");
- JSONObject jsonObject = new JSONObject(data);
- String userName = jsonObject.getString("name");
- return Result.success(rawInspectService.addRawInspects(userName, rawInspect));
+ public Result addRawInspects(@RequestHeader("token") String token, @RequestBody RawInspect rawInspect) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ return Result.success(rawInspectService.addRawInspects(data.get("name").replaceAll("\"", ""), rawInspect));
}
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 630bf15..6cd8f94 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -2,7 +2,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.InspectUnacceptedMapper">
<select id="selectUnRawInspectsList" resultType="java.util.Map">
- select DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
+ select
+ DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
code,
name,
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index bbab250..35b3fe5 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -2,7 +2,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.RepertoryMapper">
<select id="selectAllRepertory" resultType="java.util.Map">
- select name,
+ select id,
+ name,
specifications,
code,
requirements,
diff --git a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index 7a59c70..f12fdab 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -82,12 +82,9 @@
@ApiImplicitParam(name = "id", value = "閿�鍞崟id", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/updateSaleById")
- public Result updateSaleById(@RequestHeader("token") String token, Integer id, @RequestBody SaleVo saleVo) throws JSONException {
- Map<String, String> map = jwt.readJWT(token);
- String data = map.get("data");
- JSONObject jsonObject = new JSONObject(data);
- String saleman = jsonObject.getString("name");
- saleService.updateSaleById(saleman,id, saleVo);
+ public Result updateSaleById(@RequestHeader("token") String token, Integer id, @RequestBody SaleVo saleVo) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ saleService.updateSaleById(data.get("name").replaceAll("\"", ""),id, saleVo);
return Result.success("淇敼鎴愬姛!");
}
@@ -117,12 +114,9 @@
@ApiImplicitParam(name = "type", value = "鐘舵��", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/check")
- public Result check(@RequestHeader("token") String token,Integer id,Integer type) throws JSONException {
- Map<String, String> map = jwt.readJWT(token);
- String data = map.get("data");
- JSONObject jsonObject = new JSONObject(data);
- String checkname = jsonObject.getString("name");
- saleService.check(checkname,id,type);
+ public Result check(@RequestHeader("token") String token,Integer id,Integer type) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ saleService.check(data.get("name").replaceAll("\"", ""),id,type);
return Result.success("瀹℃牳鎴愬姛");
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
index a95d264..3dbf938 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
+import com.yuanchu.mom.pojo.vo.TechnologyTemplateVo1;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -46,24 +47,56 @@
return Result.success(technologyTemplateService.seleType());
}
- @ApiOperation(value = "鏌ヨ宸ュ簭妯＄増鍒楄〃")
+ @ApiOperation(value = "鏌ヨ宸ュ簭妯＄増鍒楄〃(浜岀骇鏍�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "element", value = "鍏冧欢", dataTypeClass = String.class),
@ApiImplicitParam(name = "father", value = "宸ュ簭(鐖剁被)", dataTypeClass = String.class),
@ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class,required = true)
})
@GetMapping("/selTech")
- public Result selTech(Integer pageSize,Integer countSize,String element,String father,Integer type){
- IPage<Map<String, Object>> salePage = technologyTemplateService.selTech(new Page<Object>(pageSize, countSize), element, father, type);
- Map<String, Object> map = new HashMap<>();
- map.put("total", salePage.getTotal());
- map.put("row", salePage.getRecords());
+ public Result selTech(String element,String father,Integer type){
+ List<TechnologyTemplateVo1> map = technologyTemplateService.selTech(element, father, type);
return Result.success(map);
}
+ @ApiOperation(value = "鏌ヨ宸ュ簭妯＄増璇︽儏")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "宸ュ簭id", dataTypeClass = Integer.class,required = true)
+ })
+ @GetMapping("/selTechById")
+ public Result selTechById(Integer id){
+ return Result.success(technologyTemplateService.selTechById(id));
+ }
+ @ApiOperation(value = "缂栬緫")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "宸ュ簭id", dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/updaTechById")
+ public Result updaTechById(Integer id,@RequestBody TechnologyTemplateDto technologyTemplateDto){
+ technologyTemplateService.updaTechById(id,technologyTemplateDto);
+ return Result.success("淇敼鎴愬姛!");
+ }
+
+ @ApiOperation(value = "鏍规嵁閿�鍞崟id鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "宸ュ簭id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delTech")
+ public Result delTech(Integer id) {
+ technologyTemplateService.delTech(id);
+ return Result.success("鍒犻櫎鎴愬姛!");
+ }
+
+ @ApiOperation(value = "鎵归噺鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "ids", value = "閿�鍞崟id", dataTypeClass = String.class, dataType = "List", required = true)
+ })
+ @PostMapping("/delAllTech")
+ public Result delAllTech( List<Integer> ids) {
+ technologyTemplateService.delAllTech(ids);
+ return Result.success("鎵归噺鍒犻櫎鎴愬姛!");
+ }
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
index 2051dc1..abe9947 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechnologyTemplateMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.TechnologyTemplate;
+import com.yuanchu.mom.pojo.vo.TechnologyTemplateVo1;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -22,6 +23,6 @@
List<Integer> seleType();
//鏌ヨ宸ュ簭妯＄増鍒楄〃
- IPage<Map<String, Object>> selTech(Page<Object> page, String element, String father, Integer type);
+ List<TechnologyTemplateVo1> selTech(String element, String father, Integer type);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo1.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo1.java
new file mode 100644
index 0000000..b94e8d4
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo1.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.pojo.vo;
+
+
+import com.yuanchu.mom.pojo.dto.ProductDto2;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TechnologyTemplateVo1 {
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String father;
+
+ List<TechnologyTemplateVo2> children;
+}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo2.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo2.java
new file mode 100644
index 0000000..00bd44a
--- /dev/null
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/vo/TechnologyTemplateVo2.java
@@ -0,0 +1,34 @@
+package com.yuanchu.mom.pojo.vo;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+@Data
+public class TechnologyTemplateVo2 {
+
+ @JsonSerialize
+ private Integer id;
+
+ //宸ュ簭鍚嶇О
+ @JsonSerialize
+ private String name;
+
+ //鍏冧欢
+ @JsonSerialize
+ private String element;
+
+ //鍩烘湰瑕佹眰
+ @JsonSerialize
+ private String base;
+
+ //鎺у埗瑕佺偣
+ @JsonSerialize
+ private String control;
+
+ //澶囨敞
+ @JsonSerialize
+ private String note;
+
+
+}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
index 54b99a4..64b927d 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyTemplateService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
+import com.yuanchu.mom.pojo.vo.TechnologyTemplateVo1;
import java.util.List;
import java.util.Map;
@@ -39,6 +40,32 @@
* @param type
* @return
*/
- IPage<Map<String, Object>> selTech(Page<Object> page, String element, String father, Integer type);
+ List<TechnologyTemplateVo1> selTech(String element, String father, Integer type);
+
+ /**
+ * 鏍规嵁id鏌ヨ璇︽儏
+ * @param id
+ * @return
+ */
+ TechnologyTemplateDto selTechById(Integer id);
+
+ /**
+ * 鏍规嵁id淇敼
+ * @param id
+ * @param technologyTemplateDto
+ */
+ void updaTechById(Integer id, TechnologyTemplateDto technologyTemplateDto);
+
+ /**
+ * 鏍规嵁id鍒犻櫎
+ * @param id
+ */
+ void delTech(Integer id);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param ids
+ */
+ void delAllTech(List<Integer> ids);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
index de66a99..32b9c30 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
@@ -7,6 +7,7 @@
import com.yuanchu.mom.mapper.TechnologyTemplateMapper;
import com.yuanchu.mom.pojo.TechnologyTemplate;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
+import com.yuanchu.mom.pojo.vo.TechnologyTemplateVo1;
import com.yuanchu.mom.service.TechnologyTemplateService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -44,8 +45,43 @@
//鏌ヨ宸ュ簭妯＄増鍒楄〃
@Override
- public IPage<Map<String, Object>> selTech(Page<Object> page, String element, String father, Integer type) {
- return technologyTemplateMapper.selTech(page,element,father,type);
+ public List<TechnologyTemplateVo1> selTech( String element, String father, Integer type) {
+ return technologyTemplateMapper.selTech(element,father,type);
+ }
+
+ //鏍规嵁id鏌ョ湅宸ュ簭璇︽儏
+ @Override
+ public TechnologyTemplateDto selTechById(Integer id) {
+ TechnologyTemplate technologyTemplate = technologyTemplateMapper.selectById(id);
+ TechnologyTemplateDto technologyTemplateDto = new TechnologyTemplateDto();
+ BeanUtils.copyProperties(technologyTemplate,technologyTemplateDto);
+ return technologyTemplateDto;
+ }
+
+ //鏍规嵁id淇敼
+ @Override
+ public void updaTechById(Integer id, TechnologyTemplateDto technologyTemplateDto) {
+ TechnologyTemplate technologyTemplate = technologyTemplateMapper.selectById(id);
+ BeanUtils.copyProperties(technologyTemplateDto,technologyTemplate);
+ technologyTemplateMapper.updateById(technologyTemplate);
+ }
+
+ //鏍规嵁id鍒犻櫎
+ @Override
+ public void delTech(Integer id) {
+ TechnologyTemplate technologyTemplate = technologyTemplateMapper.selectById(id);
+ technologyTemplate.setState(0);
+ technologyTemplateMapper.updateById(technologyTemplate);
+ }
+
+ //鎵归噺鍒犻櫎
+ @Override
+ public void delAllTech(List<Integer> ids) {
+ List<TechnologyTemplate> technologyTemplates = technologyTemplateMapper.selectBatchIds(ids);
+ for (TechnologyTemplate technologyTemplate : technologyTemplates) {
+ technologyTemplate.setState(0);
+ technologyTemplateMapper.updateById(technologyTemplate);
+ }
}
}
diff --git a/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml b/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
index 8acb3b4..641694e 100644
--- a/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechnologyTemplateMapper.xml
@@ -6,8 +6,24 @@
from mom_ocean.technology_template
where state = 1
</select>
- <select id="selTech" resultType="java.util.Map">
- select name,
+
+ <resultMap id="selTech" type="com.yuanchu.mom.pojo.vo.TechnologyTemplateVo1">
+ <id property="father" column="father" jdbcType="VARCHAR"/>
+ <collection property="children" resultMap="TechnologyTemplateVo2ListMap"/>
+ </resultMap>
+
+ <resultMap id="TechnologyTemplateVo2ListMap" type="com.yuanchu.mom.pojo.vo.TechnologyTemplateVo2">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="element" column="element" jdbcType="VARCHAR"/>
+ <result property="base" column="base" jdbcType="VARCHAR"/>
+ <result property="control" column="control" jdbcType="VARCHAR"/>
+ <result property="note" column="note" jdbcType="VARCHAR"/>
+ </resultMap>
+ <select id="selTech" resultMap="selTech">
+ select id,
+ father,
+ name,
element,
base,
control,
@@ -19,12 +35,12 @@
and type=#{type}
</if>
<if test="element!=null">
- and element=#{element}
+ and element like concat('%',#{element},'%')
</if>
<if test="father!=null">
- and father=#{father}
+ and father like concat('%',#{father},'%')
</if>
</where>
- group by father
+
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3