Ver código fonte

单台机器使用统计,定时清洗规则

李天标 5 anos atrás
pai
commit
cb9501e13e

+ 2 - 0
src/main/java/com/shawn/model/entity/TEquipment.java

@@ -181,6 +181,8 @@ public class TEquipment {
 	@ApiModelProperty(value="剩余使用次")
 	private Integer remaining;
 
+	@ApiModelProperty(value="定时清洗时间规则")
+	private String rule;
 	/**自定义统一方法设置主键**/
 	public void setPrimaryKey(Long primaryKey) {
 		 setId(primaryKey);

+ 62 - 0
src/main/java/com/shawn/model/entity/TEquipmentExample.java

@@ -3236,6 +3236,68 @@ public class TEquipmentExample {
             addCriterion("remaining not between", value1, value2, "remaining");
             return (Criteria) this;
         }
+
+
+
+        public Criteria andRuleIsNull() {
+            addCriterion("rule is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleIsNotNull() {
+            addCriterion("rule is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleEqualTo(Integer value) {
+            addCriterion("rule =", value, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleNotEqualTo(Integer value) {
+            addCriterion("rule <>", value, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleGreaterThan(Integer value) {
+            addCriterion("rule >", value, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleGreaterThanOrEqualTo(Integer value) {
+            addCriterion("rule >=", value, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleLessThan(Integer value) {
+            addCriterion("rule <", value, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleLessThanOrEqualTo(Integer value) {
+            addCriterion("rule <=", value, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleIn(List<Integer> values) {
+            addCriterion("rule in", values, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleNotIn(List<Integer> values) {
+            addCriterion("rule not in", values, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleBetween(Integer value1, Integer value2) {
+            addCriterion("rule between", value1, value2, "rule");
+            return (Criteria) this;
+        }
+
+        public Criteria andRuleNotBetween(Integer value1, Integer value2) {
+            addCriterion("rule not between", value1, value2, "rule");
+            return (Criteria) this;
+        }
     }
 
     /**

+ 3 - 0
src/main/java/com/shawn/model/param/StatisticsParam.java

@@ -36,4 +36,7 @@ public class StatisticsParam {
 
     @ApiModelProperty(value="是否外国")
     private String ifForeign = "0";
+
+    @ApiModelProperty(value="清洗规则")
+    private String rule;
 }

+ 41 - 0
src/main/java/com/shawn/web/controller/TEquipmentController.java

@@ -664,6 +664,47 @@ public class TEquipmentController extends BaseController<TEquipment, TEquipmentE
 
     }
 
+    //修改机器的清洗规则
+    @PostMapping("/updateRule")
+    public ResponseEntity<?> updateRule(@RequestBody StatisticsParam param) {
+        List<TEquipment> equipmentList = new ArrayList<>();
+        if(param.getEquipmentId()!=""&&param.getEquipmentId()!=null){
+            TEquipmentExample example = new TEquipmentExample();
+            TEquipmentExample.Criteria criteria = example.createCriteria();
+            criteria.andIdEqualTo(Long.valueOf(param.getEquipmentId()));
+             equipmentList = tEquipmentService.selectByOption(example);
+        }
+        if(equipmentList.size()>0){
+            TEquipment equipment = equipmentList.get(0);
+            if(param.getRule()!=""&&param.getRule()!=null){
+                equipment.setRule(param.getRule());
+                boolean b = tEquipmentService.updateById(equipment);
+                if(b){
+                    return ResponseEntity
+                            .status(HttpStatus.OK)
+                            .body(new ResultMessage()
+                                    .setCode(true)
+                                    .setData("SUCCESS")
+                                    .setMessage("SUCCESS"));
+                }else {
+                    return ResponseEntity
+                            .status(HttpStatus.OK)
+                            .body(new ResultMessage()
+                                    .setCode(true)
+                                    .setData("ERROR")
+                                    .setMessage("ERROR"));
+                }
+            }
+
+        }
+
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData("")
+                        .setMessage(""));
+    }
     public static Map<String, String> getWeekDate() {
         Map<String, String> map = new HashMap();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");

Diferenças do arquivo suprimidas por serem muito extensas
+ 26 - 7
src/main/resources/com/shawn/repository/mybatis/TEquipmentMapper.xml