From 95bd45377f1e04b448d407e3af4ee2707b90a24b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:07:52 +0800
Subject: [PATCH] MOM系统-8-17计量管理版本一结束
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 14
inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java | 111 ++++++++
inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java | 52 ++++
inspect-server/src/main/java/com/yuanchu/mom/pojo/MeasureLedger.java | 89 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java | 30 ++
inspect-server/src/main/java/com/yuanchu/mom/mapper/MeasureLedgerMapper.java | 25 +
inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml | 52 ++++
pom.xml | 16
framework/src/main/java/com/yuanchu/mom/utils/MyUtil.java | 7
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 2
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java | 2
standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 4
inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeasureLedgerServiceImpl.java | 52 ++++
inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java | 108 ++++++++
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 1
standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 7
system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 25 +
inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml | 40 +++
inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java | 26 ++
system-run/pom.xml | 6
inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java | 81 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/MeasureLedgerService.java | 26 ++
22 files changed, 748 insertions(+), 28 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/MyUtil.java b/framework/src/main/java/com/yuanchu/mom/utils/MyUtil.java
index 1e0a2b9..4281311 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/MyUtil.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/MyUtil.java
@@ -63,14 +63,13 @@
return sb.toString();
}
- public static String getTimeSixNumberCode(String prefix){
+ public static String getTimeSixNumberCode(String prefix, String keyName){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String format = simpleDateFormat.format(new Date());
String timeStr = format.replace("-", "");
- long incrNum = RedisUtil.incr("num", 1);
- System.out.println(incrNum + "==============");
+ long incrNum = RedisUtil.incr(keyName, 1);
if(incrNum == 1){
- RedisUtil.expire("num", 60 * 60 * 24);
+ RedisUtil.expire(keyName, 60 * 60 * 24);
}
String sixIncr = String.format("%06d", incrNum);
return prefix + timeStr + sixIncr;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java
new file mode 100644
index 0000000..b7546e6
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java
@@ -0,0 +1,52 @@
+package com.yuanchu.mom.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.service.MeasureLedgerService;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:41:09
+ */
+@Api(tags = "QMS绠＄悊-->璁￠噺绠＄悊")
+@RestController
+@RequestMapping("/measureLedger")
+public class MeasureLedgerController {
+
+ @Autowired
+ private MeasureLedgerService measureLedgerService;
+
+ @ApiOperation(value = "璁￠噺棰勬祴-->鍒嗛〉琛ㄦ牸")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "code", value = "璁￠噺缂栧彿", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "deviceName", value = "浠櫒璁惧鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "meteringUnit", value = "璁￠噺鍗曚綅", dataTypeClass = String.class)
+ })
+ @GetMapping("/metering_table")
+ public Result<?> selectMeasureLedger(Integer pageNo, Integer pageSize, String code, String deviceName, String meteringUnit){
+ IPage<Map<String, Object>> maps = measureLedgerService.selectMeasureLedger(new Page<Object>(pageNo, pageSize), code, deviceName, meteringUnit);
+ Map<String, Object> map = new HashMap<>();
+ map.put("row", maps.getRecords());
+ map.put("total", maps.getTotal());
+ return Result.success(map);
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
new file mode 100644
index 0000000..afd2879
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeteringPlanController.java
@@ -0,0 +1,108 @@
+package com.yuanchu.mom.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.MeteringPlan;
+import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.service.MeteringPlanService;
+import com.yuanchu.mom.service.UserService;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.utils.Jwt;
+import com.yuanchu.mom.utils.MyUtil;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.stereotype.Controller;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:42:31
+ */
+@Api(tags = "QMS绠＄悊-->璁￠噺绠＄悊")
+@RestController
+@RequestMapping("/meteringPlan")
+public class MeteringPlanController {
+
+ @Autowired
+ private MeteringPlanService meteringPlanService;
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private DeviceService deviceService;
+
+ @Autowired
+ private Jwt jwt;
+ @ApiOperation(value = "璁￠噺璁″垝-->鏂板鎸夐挳")
+ @PostMapping("/add_plan")
+ public Result<?> addMeteringPlan(@RequestHeader("token") String token,@Validated @RequestBody MeteringPlan meteringPlan) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ String id = data.get("id").replaceAll("\"", "");
+ meteringPlan.setFounder(Integer.valueOf(id));
+ Integer isInsertSuccess = meteringPlanService.addMeteringPlan(meteringPlan);
+ if (isInsertSuccess == 1){
+ return Result.success("鏂板鎴愬姛锛�");
+ }
+ return Result.fail("鏂板澶辫触锛�");
+ }
+
+ @ApiOperation(value = "璁￠噺璁″垝-->璐熻矗浜轰笅鎷夋")
+ @GetMapping("/list_user")
+ public Result<?> selectUserIdAndName(){
+ List<Map<String, Object>> maps = userService.listUserIdAndName();
+ return Result.success(maps);
+ }
+
+ @ApiOperation(value = "璁￠噺璁″垝-->璁￠噺鍗曚綅涓嬫媺妗�")
+ @GetMapping("/list_unit")
+ public Result<?> selectUnit(){
+ List<Map<String, Object>> maps = meteringPlanService.selectUnit();
+ return Result.success(maps);
+ }
+
+ @ApiOperation(value = "璁￠噺璁″垝-->鍒嗛〉琛ㄦ牸")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "code", value = "璁￠噺缂栧彿", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "meteringUnit", value = "璁￠噺鍗曚綅", dataTypeClass = String.class)
+ })
+ @GetMapping("/metering_table")
+ public Result<?> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit){
+ Map<String, Object> maps = meteringPlanService.selectMeteringTable(pageNo, pageSize, code, meteringUnit);
+ return Result.success(maps);
+ }
+
+ @ApiOperation(value = "璁￠噺璁″垝<-->璁￠噺鍙拌处锛氭煡鐪嬭閲忓饱鍘�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "measureId", value = "璁￠噺Id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "accountOrPlan", value = "true涓哄彴璐false涓鸿鍒�", dataTypeClass = Boolean.class, required = true),
+ })
+ @GetMapping("/list_record")
+ public Result<?> standingBook(Integer measureId, Boolean accountOrPlan){
+ Object maps = meteringPlanService.standingBook(measureId, accountOrPlan);
+ return Result.success(maps);
+ }
+
+ @ApiOperation(value = "璁￠噺璁″垝锛氭柊澧炴寜閽細鐐瑰嚮鏂板琛屽悗鎻愪氦璁惧鍚嶇О")
+ @GetMapping("/list_device")
+ public Result<?> selectOneDeviceId(){
+ List<Map<String, Object>> mapList = deviceService.selectDeviceIdAndName();
+ return Result.success(mapList);
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeasureLedgerMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeasureLedgerMapper.java
new file mode 100644
index 0000000..8c1dbc1
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeasureLedgerMapper.java
@@ -0,0 +1,25 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.mybatis_config.MyBaseMapper;
+import com.yuanchu.mom.pojo.MeasureLedger;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:41:09
+ */
+public interface MeasureLedgerMapper extends MyBaseMapper<MeasureLedger> {
+
+ IPage<Map<String, Object>> selectMeasureLedger(Page<Object> page, String code, String deviceName, String meteringUnit);
+
+ List<Map<String, Object>> standingBook(Integer measureId);
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java
new file mode 100644
index 0000000..f3afde4
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/MeteringPlanMapper.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.MeteringPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 02:01:38
+ */
+public interface MeteringPlanMapper extends BaseMapper<MeteringPlan> {
+
+ List<Map<String, Object>> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit);
+
+ List<Map<String, Object>> selectIdPlan(Integer measureId);
+
+ Map<String, Object> selectIdPlanIdMessage(Integer measureId);
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeasureLedger.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeasureLedger.java
new file mode 100644
index 0000000..8e15811
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeasureLedger.java
@@ -0,0 +1,89 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:41:09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "MeasureLedger瀵硅薄", description = "")
+public class MeasureLedger implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭Id", hidden = true)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @NotNull(message = "璁惧Id涓嶈兘涓虹┖锛�")
+ @ApiModelProperty(value = "璁惧Id", example = "1", required = true)
+ private Integer deviceId;
+
+ @ApiModelProperty(value = "璁￠噺璁″垝Id", hidden = true)
+ private Integer measurePlanId;
+
+
+ @ApiModelProperty(value = "娴嬮噺鑼冨洿", example = "0.2302")
+ private String measuringRange;
+
+ @NotNull(message = "璁￠噺鍛ㄦ湡涓嶈兘涓虹┖锛�")
+ @ApiModelProperty(value = "璁￠噺鍛ㄦ湡", example = "12", required = true)
+ private Integer measurePeriod;
+
+ @ApiModelProperty(value = "璁￠噺缁撴灉 1锛氭甯革紱2锛氬け鍑�")
+ private Integer measureResult;
+
+ @ApiModelProperty(value = "璁￠噺鏃ユ湡", example = "2023-08-16", dataType = "date", required = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate measureDate;
+
+ @ApiModelProperty(value = "璁￠噺鏈夋晥鏈�-寮�濮�", example = "2023-08-16", dataType = "date", required = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate validityBegin;
+
+ @ApiModelProperty(value = "璁￠噺鏈夋晥鏈�-缁撴潫", example = "2023-08-16", dataType = "date", required = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate validityEnd;
+
+ @ApiModelProperty(value = "璁￠噺缂栧彿", hidden = true)
+ private String measureNumber;
+
+ @ApiModelProperty(value = "闄勪欢", hidden = true)
+ private String attachment;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎", hidden = true)
+ @TableLogic(value = "1", delval = "0")
+ private Integer state;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java
new file mode 100644
index 0000000..eb1bbeb
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/MeteringPlan.java
@@ -0,0 +1,81 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 02:01:38
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "MeteringPlan瀵硅薄", description = "")
+public class MeteringPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "涓婚敭Id", hidden = true)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "璁″垝缂栧彿", hidden = true)
+ private String planNumber;
+
+ @NotNull(message = "璇烽�夋嫨鍒涘缓浜猴紒")
+ @ApiModelProperty(value = "鍒涘缓浜�", hidden = true)
+ private Integer founder;
+
+ @ApiModelProperty(value = "璁″垝鏃ユ湡寮�濮�", example = "2023-07-02", dataType = "date", required = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate planDateBegin;
+
+ @ApiModelProperty(value = "璁″垝鏃ユ湡缁撴潫", example = "2023-07-02", dataType = "date", required = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDate planDateEnd;
+
+ @NotBlank(message = "璇烽�夋嫨鎴栬杈撳叆璁￠噺鍗曚綅锛�")
+ @ApiModelProperty(value = "璁￠噺鍗曚綅", example = "涓婃捣璐ㄦ鎵�", required = true)
+ private String planUnit;
+
+ @NotNull(message = "璇烽�夋嫨璐熻矗浜猴紒")
+ @ApiModelProperty(value = "璐熻矗浜�", example = "1", required = true)
+ private Integer personCharge;
+
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎", hidden = true)
+ @TableLogic(value = "1", delval = "0")
+ private Integer state;
+
+ @TableField(exist = false)
+ private List<MeasureLedger> measureLedgerList;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/MeasureLedgerService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/MeasureLedgerService.java
new file mode 100644
index 0000000..f613e6f
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/MeasureLedgerService.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.MeasureLedger;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:41:09
+ */
+public interface MeasureLedgerService extends IService<MeasureLedger> {
+
+ Boolean addMeasureLedger(Integer id, List<MeasureLedger> measureLedgerList);
+
+ IPage<Map<String, Object>> selectMeasureLedger(Page<Object> page, String code, String deviceName, String meteringUnit);
+
+ List<Map<String, Object>> standingBook(Integer measureId);
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java
new file mode 100644
index 0000000..f4759fa
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/MeteringPlanService.java
@@ -0,0 +1,30 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.MeteringPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:42:31
+ */
+public interface MeteringPlanService extends IService<MeteringPlan> {
+
+ @Transactional(rollbackFor = Exception.class)
+ Integer addMeteringPlan(MeteringPlan meteringPlan);
+
+ List<Map<String, Object>> selectUnit();
+
+ Map<String, Object> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit);
+
+ Object standingBook(Integer measureId, Boolean accountOrPlan);
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index a4632f6..3b6d486 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -1,12 +1,12 @@
package com.yuanchu.mom.service.impl;
-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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.service.InspectUnacceptedService;
+import com.yuanchu.mom.vo.Result;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeasureLedgerServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeasureLedgerServiceImpl.java
new file mode 100644
index 0000000..f422035
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeasureLedgerServiceImpl.java
@@ -0,0 +1,52 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.MeasureLedger;
+import com.yuanchu.mom.mapper.MeasureLedgerMapper;
+import com.yuanchu.mom.service.MeasureLedgerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:41:09
+ */
+@Service
+public class MeasureLedgerServiceImpl extends ServiceImpl<MeasureLedgerMapper, MeasureLedger> implements MeasureLedgerService {
+
+ @Resource
+ private MeasureLedgerMapper measureLedgerMapper;
+
+ @Override
+ public Boolean addMeasureLedger(Integer id, List<MeasureLedger> measureLedgerList) {
+ for (MeasureLedger measureLedger : measureLedgerList){
+ String timeSixNumberCode = MyUtil.getTimeSixNumberCode("QCX", "QCX");
+ measureLedger.setMeasurePlanId(id);
+ measureLedger.setMeasureNumber(timeSixNumberCode);
+ }
+ int insertSuccess = measureLedgerMapper.insertBatchSomeColumn(measureLedgerList);
+ return insertSuccess >= 1;
+ }
+
+ @Override
+ public IPage<Map<String, Object>> selectMeasureLedger(Page<Object> page, String code, String deviceName, String meteringUnit) {
+ return measureLedgerMapper.selectMeasureLedger(page, code, deviceName, meteringUnit);
+ }
+
+ @Override
+ public List<Map<String, Object>> standingBook(Integer measureId) {
+ return measureLedgerMapper.standingBook(measureId);
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java
new file mode 100644
index 0000000..c9cbb3a
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/MeteringPlanServiceImpl.java
@@ -0,0 +1,111 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.MeasureLedger;
+import com.yuanchu.mom.pojo.MeteringPlan;
+import com.yuanchu.mom.mapper.MeteringPlanMapper;
+import com.yuanchu.mom.service.MeasureLedgerService;
+import com.yuanchu.mom.service.MeteringPlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.utils.MyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:42:31
+ */
+@Service
+public class MeteringPlanServiceImpl extends ServiceImpl<MeteringPlanMapper, MeteringPlan> implements MeteringPlanService {
+
+ @Resource
+ private MeteringPlanMapper meteringPlanMapper;
+
+ @Autowired
+ private MeasureLedgerService measureLedgerService;
+
+ @Override
+ public Integer addMeteringPlan(MeteringPlan meteringPlan) {
+ String timeSixNumberCode = MyUtil.getTimeSixNumberCode("P", "P");
+ meteringPlan.setPlanNumber(timeSixNumberCode);
+ int insertSuccess = meteringPlanMapper.insert(meteringPlan);
+ if (insertSuccess >= 1){
+ Boolean aBoolean = measureLedgerService.addMeasureLedger(meteringPlan.getId(), meteringPlan.getMeasureLedgerList());
+ if (aBoolean) {
+ return 1;
+ }
+ }
+ return 0;
+ }
+
+ @Override
+ public List<Map<String, Object>> selectUnit() {
+ LambdaQueryWrapper<MeteringPlan> wrapper = new LambdaQueryWrapper<>();
+ wrapper.groupBy(MeteringPlan::getPlanUnit);
+ wrapper.select(MeteringPlan::getPlanUnit);
+ return meteringPlanMapper.selectMaps(wrapper);
+ }
+
+ @Override
+ public Map<String, Object> selectMeteringTable(Integer pageNo, Integer pageSize, String code, String meteringUnit) {
+ List<Map<String, Object>> mapList = meteringPlanMapper.selectMeteringTable(pageNo, pageSize, code, meteringUnit);
+ if (!ObjectUtils.isEmpty(mapList)){
+ for (Map<String, Object> map : mapList){
+ int statue = 1;
+ try {
+ List<Map<String, Object>> result = JackSonUtil.unmarshal(JackSonUtil.marshal(map.get("result")), List.class);
+ for (Map<String, Object> mapResult : result){
+ String result1 = mapResult.get("result").toString();
+ if (result1.equals("n")){
+ statue = 0;
+ break;
+ }
+ }
+ map.put("planStatue", statue);
+ map.remove("result");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ LambdaQueryWrapper<MeteringPlan> wrapper = new LambdaQueryWrapper<>();
+ if (!ObjectUtils.isEmpty(code)){
+ wrapper.eq(MeteringPlan::getPlanNumber, code);
+ }
+ if (!ObjectUtils.isEmpty(meteringUnit)){
+ wrapper.eq(MeteringPlan::getPlanUnit, meteringUnit);
+ }
+ Long aLong = meteringPlanMapper.selectCount(wrapper);
+ Map<String, Object> map = new HashMap<>();
+ map.put("row", mapList);
+ map.put("total", aLong);
+ return map;
+ }
+
+ @Override
+ public Object standingBook(Integer measureId, Boolean accountOrPlan) {
+ if (accountOrPlan){
+ return measureLedgerService.standingBook(measureId);
+ } else {
+ Map<String, Object> meteringPlan = meteringPlanMapper.selectIdPlanIdMessage(measureId);
+ List<Map<String, Object>> mapList = meteringPlanMapper.selectIdPlan(measureId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("top", meteringPlan);
+ map.put("table", mapList);
+ return map;
+ }
+ }
+}
diff --git a/inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml b/inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml
new file mode 100644
index 0000000..c63deff
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/MeasureLedgerMapper.xml
@@ -0,0 +1,40 @@
+<?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.MeasureLedgerMapper">
+
+ <select id="selectMeasureLedger" resultType="map">
+ SELECT l.`id`, d.`code`, d.`name`,l.`measuring_range`, l.`measure_period`, l.`measure_result`, DATE_FORMAT(l.`measure_date`, '%Y-%m-%d') measureDate,
+ DATE_FORMAT(l.`validity_end`, '%Y-%m-%d') validityEnd, u.`name` founder, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') createTime,
+ r.`name` person_charge, p.`plan_unit`, l.`measure_number`
+ FROM measure_ledger l, device d, metering_plan p, `user` u, `user` r
+ WHERE l.`device_id` = d.`id`
+ AND l.`state` = 1
+ AND l.`measure_plan_id` = p.`id`
+ AND u.`id` = p.`founder`
+ AND r.`id` = p.`person_charge`
+ <if test="code != null and code != ''">
+ AND d.`code` LIKE CONCAT('%', #{code}, '%')
+ </if>
+ <if test="deviceName != null and deviceName != ''">
+ AND d.`name` LIKE CONCAT('%', #{deviceName}, '%')
+ </if>
+ <if test="meteringUnit != null and meteringUnit != ''">
+ AND p.`plan_unit` LIKE CONCAT('%', #{meteringUnit}, '%')
+ </if>
+ ORDER BY l.`create_time` DESC
+ </select>
+
+ <select id="standingBook" resultType="map">
+ SELECT m.`id`, d.`code`, d.`name`, m.`measuring_range`, m.`measure_period`, m.`measure_result`, DATE_FORMAT(m.`measure_date`, '%Y-%m-%d') measureDate,
+ DATE_FORMAT(m.`validity_end`, '%Y-%m-%d') validityEnd, u.`name` founder, DATE_FORMAT(m.`create_time`, '%Y-%m-%d') createTime, p.`plan_unit`,
+ r.`name` personCharge, p.`plan_number`, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') createTime,
+ CONCAT(p.`plan_date_begin`, ' ~ ', p.`plan_date_end`) planTime
+ FROM measure_ledger m, device d, metering_plan p, `user` u, `user` r
+ WHERE m.`state` = 1
+ AND m.`id` = #{measureId}
+ AND u.`id` = p.`founder`
+ AND r.`id` = p.`person_charge`
+ AND m.`measure_plan_id` = p.`id`
+ AND m.`device_id` = d.`id`
+ </select>
+</mapper>
diff --git a/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
new file mode 100644
index 0000000..7fc217e
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -0,0 +1,52 @@
+<?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.MeteringPlanMapper">
+
+ <resultMap id="selectMeteringTableMap" type="map">
+ <id property="id" column="id"/>
+ <result property="planNumber" column="plan_number"/>
+ <result property="planDate" column="planDate"/>
+ <result property="founder" column="founder"/>
+ <result property="personCharge" column="personCharge"/>
+ <result property="createTime" column="createTime"/>
+ <collection property="result" resultMap="selectMeteringTableTwoMap" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="selectMeteringTableTwoMap" type="map">
+ <result property="result" column="result"/>
+ </resultMap>
+ <select id="selectMeteringTable" resultMap="selectMeteringTableMap">
+ SELECT s.*, IFNULL(l.`measure_result`, 'n') result
+ FROM (SELECT m.`id`, m.`plan_number`, CONCAT(m.`plan_date_begin`, ' ~ ', m.`plan_date_end`) planDate,
+ s.`name` founder, u.`name` personCharge, DATE_FORMAT(m.`create_time`, '%Y-%m-%d') createTime
+ FROM metering_plan m, `user` u, `user` s
+ WHERE u.`id` = m.`founder`
+ AND s.`id` = m.`person_charge`
+ LIMIT #{pageNo}, #{pageSize}) s
+ LEFT JOIN measure_ledger l
+ ON l.`measure_plan_id` = s.`id`
+ WHERE l.`state` = 1
+ </select>
+
+ <select id="selectIdPlan" resultType="map">
+ SELECT m.`id`, d.`code`, d.`name`, m.`measuring_range`, m.`measure_period`, m.`measure_result`, DATE_FORMAT(m.`measure_date`, '%Y-%m-%d') measureDate,
+ DATE_FORMAT(m.`validity_end`, '%Y-%m-%d') validityEnd, u.`name` founder, DATE_FORMAT(m.`create_time`, '%Y-%m-%d') createTime, p.`plan_unit`, r.`name` personCharge, m.`measure_number`
+ FROM measure_ledger m, device d, metering_plan p, `user` u, `user` r
+ WHERE p.`state` = 1
+ AND p.`id` = #{measureId}
+ AND u.`id` = p.`founder`
+ AND r.`id` = p.`person_charge`
+ AND m.`measure_plan_id` = p.`id`
+ AND m.`device_id` = d.`id`
+ </select>
+
+ <select id="selectIdPlanIdMessage" resultType="map">
+ SELECT p.`plan_number`, u.`name` founder, r.`name` person_charge, CONCAT(p.`plan_date_begin`, ' ~ ', p.`plan_date_end`) planTime,
+ DATE_FORMAT(p.`create_time`, '%Y-%m-%d') createTime, p.`plan_unit`
+ FROM metering_plan p, `user` u, `user` r
+ WHERE r.`id` = p.`person_charge`
+ AND u.`id` = p.`founder`
+ AND p.`state` = 1
+ AND p.`id` = #{measureId}
+ </select>
+</mapper>
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
index 70d8f9b..b96b27b 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
@@ -45,7 +45,7 @@
@Override
public String addCon(String name, ConsignmentDto consignmentDto) {
//鐢熸垚涓�涓娂杩愬崟缂栧彿
- String escortCode = MyUtil.getTimeSixNumberCode("YY");
+ String escortCode = MyUtil.getTimeSixNumberCode("YY", "num");
List<Consignment> consignments = consignmentMapper.selectAll();
//濡傛灉鍙戣揣琛ㄤ腑娌℃湁鏁版嵁涔熷彲浠ュ彂璐�
if (consignments.size() == 0) {
diff --git a/pom.xml b/pom.xml
index 7ea6c40..a3f1ad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<openfeign.version>3.1.3</openfeign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<shiro.version>1.5.3</shiro.version>
- <velocity-engine.version>2.3</velocity-engine.version>
+ <freemwork.version>2.3.32</freemwork.version>
<!--鎻愪氦鍓�-->
<!-- 鎵撳寘鍚庡鍑虹殑璺緞 -->
<package.path>${project.build.directory}/BLOG</package.path>
@@ -125,6 +125,13 @@
<version>${mybatis-plus.version}</version>
</dependency>
+ <!--浠ｇ爜鐢熸垚鍣ㄦā鏉�-->
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </dependency>
+
<!--feign-->
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -144,13 +151,6 @@
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
<version>${shiro.version}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚鍣ㄦā鏉匡紝鐢ㄤ簬鐢熸垚浠ｇ爜 -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${velocity-engine.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 4233c11..f980a60 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -143,12 +143,13 @@
@ApiOperation(value = "鍒犻櫎鏍戞ā鍧楁暟鎹�", tags = "QMS绠＄悊-->瀹為獙瀹ょ鐞�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鏍规嵁璁惧Id鍒犻櫎", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "type", value = "璁惧绫诲瀷", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "deviceFather", value = "鏍规嵁璁惧鍒嗙被鍒犻櫎", dataTypeClass = String.class)
})
@DeleteMapping("/deleteIdorFather")
- public Result<?> deviceDeleteIdOrFather(Integer id, String deviceFather){
- Integer map = deviceService.deviceDeleteIdOrFather(id, deviceFather);
- if (map == 1){
+ public Result<?> deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather){
+ Integer map = deviceService.deviceDeleteIdOrFather(id, type, deviceFather);
+ if (map >= 1){
return Result.success("鍒犻櫎鎴愬姛锛�");
}
return Result.fail("鍒犻櫎澶辫触锛�");
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index 0d01479..23233a7 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -36,5 +36,7 @@
Integer deviceDelete(Integer deviceId);
- Integer deviceDeleteIdOrFather(Integer id, String deviceFather);
+ Integer deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather);
+
+ List<Map<String, Object>> selectDeviceIdAndName();
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index a889152..9568176 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -95,14 +95,24 @@
}
@Override
- public Integer deviceDeleteIdOrFather(Integer id, String deviceFather) {
+ public Integer deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather) {
LambdaUpdateWrapper<Device> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(Device::getState, 0);
- if (id != null) {
+ if (id == null && deviceFather == null) {
+ return 0;
+ } else if (id != null) {
updateWrapper.eq(Device::getId, id);
} else if (deviceFather != null) {
+ updateWrapper.eq(Device::getType, type);
updateWrapper.eq(Device::getFather, deviceFather);
}
return deviceMapper.update(new Device(), updateWrapper);
}
+
+ @Override
+ public List<Map<String, Object>> selectDeviceIdAndName() {
+ LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(Device::getId, Device::getName);
+ return deviceMapper.selectMaps(wrapper);
+ }
}
diff --git a/system-run/pom.xml b/system-run/pom.xml
index 426bf92..edcd688 100644
--- a/system-run/pom.xml
+++ b/system-run/pom.xml
@@ -58,10 +58,10 @@
<artifactId>mybatis-plus-generator</artifactId>
</dependency>
- <!-- 浠ｇ爜鐢熸垚鍣ㄦā鏉匡紝鐢ㄤ簬鐢熸垚浠ｇ爜 -->
+ <!--浠ｇ爜鐢熸垚鍣ㄦā鏉�-->
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
</dependency>
<!--mysql-->
diff --git a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
index 0528933..48f2da3 100644
--- a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
+++ b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
@@ -1,10 +1,13 @@
package com.yuanchu.mom;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.generator.FastAutoGenerator;
import com.baomidou.mybatisplus.generator.config.*;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+import com.baomidou.mybatisplus.generator.fill.Column;
import java.util.Collections;
import java.util.Scanner;
@@ -12,11 +15,11 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://localhost:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
- public static String database_username = "root";
+ public static String database_url = "jdbc:mysql://192.168.110.209:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ public static String database_username = "user";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
- public static String model_name = "/sale-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
+ public static String model_name = "/inspect-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
public static String setParent = "com.yuanchu.mom"; // 鍖呰矾寰�
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir");
@@ -28,6 +31,7 @@
.commentDate("yyyy-MM-dd hh:mm:ss") //娉ㄩ噴鏃ユ湡
.outputDir(projectPath + model_name + "/src/main/java") // 鎸囧畾杈撳嚭鐩綍
.disableOpenDir() //绂佹鎵撳紑杈撳嚭鐩綍锛岄粯璁ゆ墦寮�
+ .enableSwagger() // 寮�鍚痵wagger
;
})
// 鍖呴厤缃�
@@ -45,19 +49,30 @@
.enableLombok() //寮�鍚� Lombok
.naming(NamingStrategy.underline_to_camel) //鏁版嵁搴撹〃鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐锛氫笅鍒掔嚎杞┘宄板懡
.columnNaming(NamingStrategy.underline_to_camel) //鏁版嵁搴撹〃瀛楁鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐锛氫笅鍒掔嚎杞┘宄板懡
+ .enableFileOverride() // 瑕嗙洊宸茬粡鐢熸垚鐨凟ntity鏂囦欢
+ .logicDeleteColumnName("state")
+ .addTableFills(
+ new Column("create_time", FieldFill.INSERT),
+ new Column("update_time", FieldFill.INSERT_UPDATE)
+ )
+
// Mapper 绛栫暐閰嶇疆
.mapperBuilder()
- .enableFileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
+ .enableFileOverride() // 瑕嗙洊宸茬敓鎴怣apper鏂囦欢
+
// Service 绛栫暐閰嶇疆
.serviceBuilder()
- .enableFileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
.formatServiceFileName("%sService") //鏍煎紡鍖� service 鎺ュ彛鏂囦欢鍚嶇О锛�%s杩涜鍖归厤琛ㄥ悕锛屽 UserService
.formatServiceImplFileName("%sServiceImpl") //鏍煎紡鍖� service 瀹炵幇绫绘枃浠跺悕绉帮紝%s杩涜鍖归厤琛ㄥ悕锛屽 UserServiceImpl
+ .enableFileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
+
// Controller 绛栫暐閰嶇疆
.controllerBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
;
})
+ //5銆佹ā鏉垮紩鎿�
+ .templateEngine(new FreemarkerTemplateEngine()) //榛樿
.execute();
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index ed64ed1..8cecbf2 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -17,4 +17,5 @@
* 妫�楠屾ā鍧�-->OMS绠＄悊-->鎴愬搧妫�楠�-->鏂板(闇�瑕佺敤鎴稩d涓庡悕绉�)
*/
List<Map<String, Object>> listUserIdAndName();
+
}
--
Gitblit v1.9.3