feat：“添加远程制作雪糕功能"

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

@@ -55,47 +55,53 @@ public class TSugarDoController {
 
     @ApiOperation(value = "远程做糖")
     @GetMapping("/doSugar")
-    public ResponseEntity<?> doSugar(Long equipmentId,String productName){
-        if(equipmentId!=null){
+    public ResponseEntity<?> doSugar(Long equipmentId, String productName, String makeCodes) {
+        if (equipmentId != null) {
             TEquipment equipment = tEquipmentService.getById(equipmentId);
             Long equipmentAdminId = equipment.getAdminId();
-                //判断本日是否已做二十个糖
-                LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
-                query.eq(TSugarDo::getAdminId,Long.valueOf(equipmentAdminId));
-
-
-                Calendar todayStart = Calendar.getInstance();
-                todayStart.set(Calendar.HOUR_OF_DAY, 0);
-                todayStart.set(Calendar.MINUTE, 0);
-                todayStart.set(Calendar.SECOND, 0);
-                query.gt(TSugarDo::getCreateDate,todayStart.getTime());
-                Calendar todayEnd = Calendar.getInstance();
-                todayEnd.set(Calendar.HOUR_OF_DAY, 23);
-                todayEnd.set(Calendar.MINUTE, 59);
-                todayEnd.set(Calendar.SECOND, 59);
-                query.le(TSugarDo::getCreateDate,todayEnd.getTime());
-                query.eq(TSugarDo::getStatus,"1");
-                List<TSugarDo> sugarDoList = tSugarDoService.list(query);
-                if(sugarDoList.size()>20){
-                    return ResponseEntity.status(HttpStatus.OK)
-                            .body(new ResultMessage().setCode(false).setData("").setMessage("做糖数量已满"));
-                }
-                StringBuilder number = new StringBuilder();
-                Random random = new Random();
-                number.append(String.valueOf(equipmentAdminId)).append("-");
-                for (int i = 0; i < 6; i++) {
-                    number.append(String.valueOf(random.nextInt(10)));
-                }
-                TSugarDo sugarDo = new TSugarDo();
-                sugarDo.setAdminId(equipmentAdminId);
-                sugarDo.setClientId(equipment.getClientId());
-                sugarDo.setStatus("0");
-                sugarDo.setNo(number.toString());
-                sugarDo.setProductName(productName);
-                Date date = new Date();
-                sugarDo.setCreateDate(date);
-                sugarDo.setModifyDate(date);
-                tSugarDoService.save(sugarDo);
+            //判断本日是否已做二十个糖
+            LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
+            query.eq(TSugarDo::getAdminId, Long.valueOf(equipmentAdminId));
+
+
+            Calendar todayStart = Calendar.getInstance();
+            todayStart.set(Calendar.HOUR_OF_DAY, 0);
+            todayStart.set(Calendar.MINUTE, 0);
+            todayStart.set(Calendar.SECOND, 0);
+            query.gt(TSugarDo::getCreateDate, todayStart.getTime());
+            Calendar todayEnd = Calendar.getInstance();
+            todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+            todayEnd.set(Calendar.MINUTE, 59);
+            todayEnd.set(Calendar.SECOND, 59);
+            query.le(TSugarDo::getCreateDate, todayEnd.getTime());
+            query.eq(TSugarDo::getStatus, "1");
+            List<TSugarDo> sugarDoList = tSugarDoService.list(query);
+            if (sugarDoList.size() > 20) {
+                return ResponseEntity.status(HttpStatus.OK)
+                        .body(new ResultMessage().setCode(false).setData("").setMessage("做糖数量已满"));
+            }
+            StringBuilder number = new StringBuilder();
+            Random random = new Random();
+            number.append(String.valueOf(equipmentAdminId)).append("-");
+            for (int i = 0; i < 6; i++) {
+                number.append(String.valueOf(random.nextInt(10)));
+            }
+            TSugarDo sugarDo = new TSugarDo();
+            sugarDo.setAdminId(equipmentAdminId);
+            sugarDo.setClientId(equipment.getClientId());
+            sugarDo.setStatus("0");
+            sugarDo.setNo(number.toString());
+            sugarDo.setProductName(productName);
+            Date date = new Date();
+            sugarDo.setCreateDate(date);
+            sugarDo.setModifyDate(date);
+            tSugarDoService.save(sugarDo);
+            String machineType = equipment.getMachineType();
+            if (StringUtils.isNotEmpty(machineType) && machineType.equals("2")) {
+                // 如果是冰淇淋
+                makeCodes = "[" + makeCodes + "]";
+                tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("dosugar", makeCodes).toString());
+            } else {
                 JSONObject kindData = new JSONObject();
                 LambdaQueryWrapper<TProduct> queryWrapper = Wrappers.lambdaQuery();
                 queryWrapper.eq(TProduct::getEquipmentId, equipmentId);
@@ -108,52 +114,55 @@ public class TSugarDoController {
                     TNameDictionary nameDictionary = nameDictionaryService.getOne(wrapper);
                     productName = nameDictionary.getName();
                 }
-                kindData.put("productName" , productName);
-                kindData.put("no" , sugarDo.getNo());
+                kindData.put("productName", productName);
+                kindData.put("no", sugarDo.getNo());
                 tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("dosugar", kindData.toString()).toString());
-                return ResponseEntity.status(HttpStatus.OK)
-                        .body(new ResultMessage().setCode(true).setData(sugarDo).setMessage("SUCCESS"));
+            }
+            return ResponseEntity.status(HttpStatus.OK)
+                    .body(new ResultMessage().setCode(true).setData(sugarDo).setMessage("SUCCESS"));
         }
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new ResultMessage().setCode(false).setData("").setMessage("ERROR"));
     }
+
     @ApiOperation(value = "查询远程做糖状态")
     @GetMapping("/selectSugarStatus")
-    public ResponseEntity<?> selectSugarStatus(String no){
+    public ResponseEntity<?> selectSugarStatus(String no) {
         LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
-        query.eq(TSugarDo::getNo,no);
+        query.eq(TSugarDo::getNo, no);
         List<TSugarDo> tSugarDos = tSugarDoService.list(query);
-        if(tSugarDos.size()==0){
+        if (tSugarDos.size() == 0) {
             return ResponseEntity.status(HttpStatus.OK)
                     .body(new ResultMessage().setCode(false).setData("").setMessage("ERROR"));
         }
-        TSugarDo sugarDo = tSugarDos.get(tSugarDos.size()-1);
-        if(sugarDo.getId()!=null){
+        TSugarDo sugarDo = tSugarDos.get(tSugarDos.size() - 1);
+        if (sugarDo.getId() != null) {
             String status = sugarDo.getStatus();
-            if(status.equals("0")){
+            if (status.equals("0")) {
                 return ResponseEntity.status(HttpStatus.OK)
                         .body(new ResultMessage().setCode(false).setData("0").setMessage("机器未上传数据"));
             }
-            if(status.equals("1")){
+            if (status.equals("1")) {
                 return ResponseEntity.status(HttpStatus.OK)
-                        .body(new ResultMessage().setCode(true).setData("1").setMessage("机器已接收到做糖指令："+ sugarDo.getProductName()));
+                        .body(new ResultMessage().setCode(true).setData("1").setMessage("机器已接收到做糖指令：" + sugarDo.getProductName()));
             }
-            if(status.equals("2")){
+            if (status.equals("2")) {
                 return ResponseEntity.status(HttpStatus.OK)
-                        .body(new ResultMessage().setCode(false).setData("2").setMessage("机器异常无法做糖："+ sugarDo.getNote()));
+                        .body(new ResultMessage().setCode(false).setData("2").setMessage("机器异常无法做糖：" + sugarDo.getNote()));
             }
-        }else {
+        } else {
             return ResponseEntity.status(HttpStatus.OK)
                     .body(new ResultMessage().setCode(false).setData("3").setMessage("网络异常"));
         }
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new ResultMessage().setCode(true).setData("4").setMessage("ERROR"));
     }
+
     @ApiOperation(value = "今日做糖列表")
     @GetMapping("/selectSugarList")
-    public ResponseEntity<?> selectSugarList(String adminId){
+    public ResponseEntity<?> selectSugarList(String adminId) {
         LambdaQueryWrapper<TSugarDo> query = Wrappers.lambdaQuery();
-        query.eq(TSugarDo::getAdminId,adminId);
+        query.eq(TSugarDo::getAdminId, adminId);
 
         Calendar todayStart = Calendar.getInstance();
         todayStart.set(Calendar.HOUR_OF_DAY, 0);
@@ -165,24 +174,24 @@ public class TSugarDoController {
         todayEnd.set(Calendar.MINUTE, 59);
         todayEnd.set(Calendar.SECOND, 59);
 //        criteria.andCreateDateLessThanOrEqualTo(todayEnd.getTime());
-        query.gt(TSugarDo::getCreateDate,todayStart.getTime());
-        query.le(TSugarDo::getCreateDate,todayEnd.getTime());
-        query.eq(TSugarDo::getStatus,"1");
+        query.gt(TSugarDo::getCreateDate, todayStart.getTime());
+        query.le(TSugarDo::getCreateDate, todayEnd.getTime());
+        query.eq(TSugarDo::getStatus, "1");
 //        criteria.andStatusEqualTo("1");
         List<TSugarDo> sugarDoList = tSugarDoService.list(query);
         List<TSugarDo> sugarDos = new ArrayList<>();
-        for(TSugarDo sugarDo:sugarDoList){
+        for (TSugarDo sugarDo : sugarDoList) {
             Date modifyDate = sugarDo.getModifyDate();
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String format = simpleDateFormat.format(modifyDate);
             String[] split = format.split(" ");
             String s = split[1];
-            if(sugarDo.getStatus().equals("1")){
+            if (sugarDo.getStatus().equals("1")) {
 //                sugarDo.setProductName("商品:"+sugarDo.getProductName()+" 时间:"+s+" 已做糖 "+" 设备:"+sugarDo.getClientId().substring(sugarDo.getClientId().length()-6));
                 sugarDos.add(sugarDo);
 
             }
-            if(sugarDo.getStatus().equals("2")){
+            if (sugarDo.getStatus().equals("2")) {
 //                sugarDo.setProductName("商品:"+sugarDo.getProductName()+" 时间:"+s+ " 异常:"+sugarDo.getNote()+" 设备:"+sugarDo.getClientId().substring(sugarDo.getClientId().length()-6));
                 sugarDos.add(sugarDo);
 

src/main/java/com/szwl/util/WechatSendUtil.java

@@ -149,9 +149,9 @@ public class WechatSendUtil {
                 "Best Regards.<br>" +
                 "<b>Cotton Candy Service Team</b>";
         content.append(str1).append(name).append(str3).append(timeByZoneId).append(str4).append(str5).append(str6);
-//        MailUtil mailUtil = new MailUtil();
-//        mailUtil.send(email, subject, content.toString());
-        new SampleMail().sendAuthCode(email, content.toString(), subject);
+        MailUtil mailUtil = new MailUtil();
+        mailUtil.send(email, subject, content.toString());
+//        new SampleMail().sendAuthCode(email, content.toString(), subject);
         System.out.println("邮件发送成功");
     }