Merge remote-tracking branch 'origin/test' into test

src/main/java/com/szwl/controller/IndexController.java

@@ -82,13 +82,15 @@ public class IndexController { ;
         Integer eqeStatus = equipmentVo.getEqeStatus();
         Boolean is_sleep = equipmentVo.getIs_sleep();
         String netWorkingMode = equipmentVo.getNetWorkingMode();
+        String numberOne = equipmentVo.getNumberOne();
+        String candyGeneratorTm = equipmentVo.getCandyGeneratorTm();
+        String outsideTm = equipmentVo.getOutsideTm();
+        String outsideHd = equipmentVo.getOutsideHd();
+
         //有记录，则进行修改
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
-//        List<TEquipment> list = equipmentService.list(query);
-//        TEquipment _new = list.get(0);
         TEquipment _new = equipmentService.getOne(query);
-//        Equipment _new = equipmentService.findByClientId(clientId);
         if (_new != null) {
             _new.setNetWorkingMode(netWorkingMode);
             if(StringUtils.isNotEmpty(cabinetTm)){
@@ -158,6 +160,18 @@ public class IndexController { ;
             if(StringUtils.isNotEmpty(equipmentVo.getCornGeneratorTm())){
                 equipmentDesc.setCornGeneratorTm(equipmentVo.getCornGeneratorTm());
             }
+            if(StringUtils.isNotEmpty(numberOne)){
+                equipmentDesc.setNumberOne(numberOne);
+            }
+            if(StringUtils.isNotEmpty(candyGeneratorTm)){
+                equipmentDesc.setCandyGeneratorTm(candyGeneratorTm);
+            }
+            if(StringUtils.isNotEmpty(outsideHd)){
+                equipmentDesc.setOutsideHd(outsideHd);
+            }
+            if(StringUtils.isNotEmpty(outsideTm)){
+                equipmentDesc.setOutsideTm(outsideTm);
+            }
             equipmentDescService.updateById(equipmentDesc);
 //            return JsonMessage.success("心跳成功");
             return "心跳成功";
@@ -1316,12 +1330,11 @@ public class IndexController { ;
 
     /**
      * 修改设备共同参数/进阶参数
-     *  code 0：通用参数；1：进阶参数；2：调试页参数
+     *  code 0：通用参数；1：进阶参数；2：调试页参数；3：湿度参数
      * @param
      * @return
      */
     @RequestMapping(value = "/updateParamNew", method = RequestMethod.POST)
-//    @PostMapping(value = "/updateParamNew", produces = "text/html;charset=utf-8")
     @ResponseBody
     public String updateParamNew(Integer code, String clientId, @RequestBody List<CommonParamVo> commonParamVos) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
@@ -1337,9 +1350,9 @@ public class IndexController { ;
         queryParameters.eq(TParameters::getClientId,clientId);
         queryParameters.eq(TParameters::getStatus,code);
         queryParameters.eq(TParameters::getEquipmentId,equipment.getId());
-        List<TParameters> list1 = parametersService.list(queryParameters);
-        if(list1.size()>0){
-            for(TParameters parameters:list1){
+        List<TParameters> list = parametersService.list(queryParameters);
+        if(list.size()>0){
+            for(TParameters parameters:list){
                 //删除旧的参数
                 parametersService.removeById(parameters.getId());
             }
@@ -1361,7 +1374,7 @@ public class IndexController { ;
 
     /**
      * 修改单个设备共同参数/进阶参数
-     *  code 0：通用参数；1：进阶参数；2：调试页参数
+     *  code 0：通用参数；1：进阶参数；2：调试页参数；3：湿度参数
      * @param
      * @return
      */
@@ -1827,7 +1840,7 @@ public class IndexController { ;
         return "error";
     }
     /**
-     *修改优惠券开关状态
+     * 修改优惠券开关状态
      *
      * @param clientId
 

src/main/java/com/szwl/controller/TAdminController.java

@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -511,6 +512,9 @@ public class TAdminController {
             admin.setUsername(registerParam.getUsername());
             admin.setName(registerParam.getName());
             admin.setIfForeign(registerParam.getIfForeign());
+            if (registerParam.getIfForeign().equals("1")) {
+                admin.setPromoCodeOpen("0");
+            }
             admin.setCompanyType(registerParam.getCompanyType());
             if (Pattern.matches(phoneReg, phoneOrEmail)) {
                 admin.setPhone(registerParam.getPhoneOrEmail());
@@ -579,7 +583,7 @@ public class TAdminController {
     @ApiOperation(value = "登录")
     @PostMapping("/login")
     @Audit(type = AuditEnum.LOGIN, content = "#username + '请求登录'")
-    public ResponseModel<UserDetailBO> login(String username, String password, String hostName) {
+    public ResponseModel<UserDetailBO> login(String username, String password, String hostName, HttpServletRequest request) {
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
             return R.fail(ResponseCodesEnum.A0001, "参数有空");
         }
@@ -619,8 +623,22 @@ public class TAdminController {
         if (StringUtils.isEmpty(tAdmin.getManagerId())) {
             String managerId = AdminUtils.encrypt(false, tAdmin.getId());
             tAdmin.setManagerId(managerId);
-            tAdminService.updateById(tAdmin);
         }
+        // 设置登录时间
+        tAdmin.setLoginDate(new Date());
+        // 登录IP
+        String ipAddress = null;
+        // 获取通过代理服务器传递的真实IP地址
+        String xForwardedForHeader = request.getHeader("X-Forwarded-For");
+        if (xForwardedForHeader == null) {
+            ipAddress = request.getRemoteAddr();
+        } else {
+            // 多次反向代理后会有多个IP值，第一个IP才是真实IP
+            String[] ips = xForwardedForHeader.split(",");
+            ipAddress = ips[0].trim();
+        }
+        tAdmin.setLoginIp(ipAddress);
+        tAdminService.updateById(tAdmin);
         UserDetailBO userDetailBO = tAdminService.getUserDetailBO(tAdmin);
         return R.ok(userDetailBO);
     }
@@ -634,7 +652,7 @@ public class TAdminController {
         }
 
         //验证用户名登录
-        Integer adminId = Integer.valueOf(id);
+        Long adminId = Long.valueOf(id);
         TAdmin admin = tAdminService.getById(adminId);
         TAdmin tAdmin = Optional.ofNullable(admin)
                 .orElseThrow(() -> new BizException(ResponseCodesEnum.L0002));
@@ -706,10 +724,10 @@ public class TAdminController {
         }
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         if (StringUtils.isNotEmpty(name)) {
-            query.eq(TAdmin::getName, name);
+            query.like(TAdmin::getName, name);
         }
         if (StringUtils.isNotEmpty(userName)) {
-            query.eq(TAdmin::getUsername, userName);
+            query.like(TAdmin::getUsername, userName);
         }
         if (StringUtils.isNotEmpty(ifForeign)) {
             query.eq(TAdmin::getIfForeign, ifForeign);

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -226,6 +226,10 @@ public class TEquipmentController {
                 equipmentDTO.setCupQuantity(equipmentDesc.getCupQuantity());
                 equipmentDTO.setStirTm(equipmentDesc.getStirTm());
                 equipmentDTO.setCornGeneratorTm(equipmentDesc.getCornGeneratorTm());
+                equipmentDTO.setNumberOne(equipmentDesc.getNumberOne());
+                equipmentDTO.setCandyGeneratorTm(equipmentDesc.getCandyGeneratorTm());
+                equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
+                equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
             }
 
         }
@@ -249,6 +253,10 @@ public class TEquipmentController {
             if (equipmentDesc.getFlowers() != null) {
                 equipmentDTO.setFlowers(equipmentDesc.getFlowers());
             }
+            equipmentDTO.setNumberOne(equipmentDesc.getNumberOne());
+            equipmentDTO.setCandyGeneratorTm(equipmentDesc.getCandyGeneratorTm());
+            equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
+            equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
         }
         String messageReceiver = equipment.getMessageReceiver();
         if (StringUtils.isNotEmpty(messageReceiver)) {
@@ -771,26 +779,10 @@ public class TEquipmentController {
             return R.fail(ResponseCodesEnum.A0001, "找不到设备");
         }
         TEquipmentDesc tEquipmentDesc = equipmentDescService.getById(equipment.getId());
-
-        Long adminId = equipment.getAdminId();
-        LambdaQueryWrapper<TAdmin> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(TAdmin::getId, adminId);
-        TAdmin admin = tAdminService.getOne(wrapper);
-        Integer type = admin.getType();
-//        String ifForeign = admin.getIfForeign();
-//        if (type < 2 && "0".equals(ifForeign)) {
-        if (type < 2) {
-            if (tEquipmentDesc != null) {
-                tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("couponStatus", couponStatus).toString());
-                equipment.setCouponStatus(couponStatus);
-                tEquipmentService.saveOrUpdate(equipment);
-                tEquipmentDesc.setCouponStatus(couponStatus);
-                equipmentDescService.saveOrUpdate(tEquipmentDesc);
-            } else {
-                return R.fail(ResponseCodesEnum.A0001, "找不到设备描述");
-            }
+        if (tEquipmentDesc != null) {
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("couponStatus", couponStatus).toString());
         } else {
-            return R.fail("仅管理员可操作");
+            return R.fail(ResponseCodesEnum.A0001, "找不到设备");
         }
         return R.ok(null, "修改成功");
     }

src/main/java/com/szwl/mapper/xml/TEquipmentDescMapper.xml

@@ -24,11 +24,15 @@
         <result column="cup_quantity" property="cupQuantity" />
         <result column="stir_tm" property="stirTm" />
         <result column="corn_generator_tm" property="cornGeneratorTm" />
+        <result column="number_one" property="numberOne" />
+        <result column="candy_generator_tm" property="candyGeneratorTm" />
+        <result column="outside_tm" property="outsideTm" />
+        <result column="outside_hd" property="outsideHd" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        equipment_id, flowers, white_sugar, red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use, pay_type, note, status, coupon_status, out_door, in_door, sleep_desc, cup_quantity, stir_tm, corn_generator_tm
+        equipment_id, flowers, white_sugar, red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use, pay_type, note, status, coupon_status, out_door, in_door, sleep_desc, cup_quantity, stir_tm, corn_generator_tm, number_one, candy_generator_tm, outside_tm, outside_hd
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/bean/EquipmentVo.java

@@ -133,4 +133,16 @@ public class EquipmentVo {
     @ApiModelProperty(value = "玉米发生器温度")
     private String cornGeneratorTm;
 
+    @ApiModelProperty(value = "NO.1000温度")
+    private String numberOne;
+
+    @ApiModelProperty(value = "棉花糖发生器温度")
+    private String candyGeneratorTm;
+
+    @ApiModelProperty(value = "柜外温度")
+    private String outsideTm;
+
+    @ApiModelProperty(value = "柜外湿度")
+    private String outsideHd;
+
 }

src/main/java/com/szwl/model/bean/TEquipmentDTO.java

@@ -110,6 +110,18 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "玉米发生器温度")
     private String cornGeneratorTm;
 
+    @ApiModelProperty(value = "NO.1000温度")
+    private String numberOne;
+
+    @ApiModelProperty(value = "棉花糖发生器温度")
+    private String candyGeneratorTm;
+
+    @ApiModelProperty(value = "柜外温度")
+    private String outsideTm;
+
+    @ApiModelProperty(value = "柜外湿度")
+    private String outsideHd;
+
     public Long getCupQuantity() {
         return cupQuantity;
     }
@@ -286,4 +298,36 @@ public class TEquipmentDTO extends TEquipment {
     public void setMessageReceiver3(String messageReceiver3) {
         this.messageReceiver3 = messageReceiver3;
     }
+
+    public String getNumberOne() {
+        return numberOne;
+    }
+
+    public void setNumberOne(String numberOne) {
+        this.numberOne = numberOne;
+    }
+
+    public String getCandyGeneratorTm() {
+        return candyGeneratorTm;
+    }
+
+    public void setCandyGeneratorTm(String candyGeneratorTm) {
+        this.candyGeneratorTm = candyGeneratorTm;
+    }
+
+    public String getOutsideTm() {
+        return outsideTm;
+    }
+
+    public void setOutsideTm(String outsideTm) {
+        this.outsideTm = outsideTm;
+    }
+
+    public String getOutsideHd() {
+        return outsideHd;
+    }
+
+    public void setOutsideHd(String outsideHd) {
+        this.outsideHd = outsideHd;
+    }
 }

src/main/java/com/szwl/model/entity/TEquipmentDesc.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-08-17
+ * @since 2023-10-31
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -23,6 +23,7 @@ public class TEquipmentDesc implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "设备唯一ID")
     @TableId(value = "equipment_id", type = IdType.ASSIGN_ID)
     private Long equipmentId;
 
@@ -82,5 +83,17 @@ public class TEquipmentDesc implements Serializable {
     @ApiModelProperty(value = "玉米发生器温度")
     private String cornGeneratorTm;
 
+    @ApiModelProperty(value = "NO.1000温度")
+    private String numberOne;
+
+    @ApiModelProperty(value = "棉花糖发生器温度")
+    private String candyGeneratorTm;
+
+    @ApiModelProperty(value = "柜外温度")
+    private String outsideTm;
+
+    @ApiModelProperty(value = "柜外湿度")
+    private String outsideHd;
+
 
 }