瀏覽代碼

feat:“添加DIY花型屏蔽显示功能,脱机操作日志功能优化”

soobin 1 年之前
父節點
當前提交
80d05aca90

+ 0 - 10
src/main/java/com/szwl/controller/AlarmRecordIndexController.java

@@ -51,13 +51,8 @@ public class AlarmRecordIndexController {
         List<TEquipment> list = equipmentService.list(query);
         TEquipment equipment = list.get(0);
         if (equipment == null) {
-//            return JsonMessage.error("添加报警记录失败");
             return "添加报警记录失败";
         }
-//        if (equipment.getType() == null) {
-////            return JsonMessage.error("商家类型不存在");
-//            return "商家类型不存在";
-//        }
         Integer type = equipment.getType();
         Long adminId = equipment.getAdminId();
         Long equipmentId = equipment.getId();
@@ -101,10 +96,8 @@ public class AlarmRecordIndexController {
                         "Magic Candy Service Team";
                 contnet.append(str1).append(name).append(str2).append(alarmRecordVo.getOccurrenceTime()).append(str3).append(alarmContent).append(str4);
                 new MailUtil().send(email,subject,contnet.toString());
-//                return JsonMessage.success("报警记录添加成功");
                 return "报警记录添加成功";
             }else {
-//                return JsonMessage.error("email is null");
                 return "email is null";
             }
         }
@@ -125,9 +118,7 @@ public class AlarmRecordIndexController {
             }
 
         } catch (Exception e) {
-//            logger.info("短信发送结果:" + result);
         }
-//        return JsonMessage.success("报警记录添加成功");
         return "报警记录添加成功";
     }
 
@@ -145,7 +136,6 @@ public class AlarmRecordIndexController {
     public String getTime() {
         Date date = new Date();
         SimpleDateFormat sformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//日期格式
-//        return JsonMessage.success(sformat.format(date));
         return sformat.format(date);
     }
 

+ 115 - 154
src/main/java/com/szwl/controller/IndexController.java

@@ -40,31 +40,45 @@ import java.util.*;
 @Api(value = "/indexController", tags = {"设备信息上传接口"})
 @RestController
 @RequestMapping("/api/app_equipment/index")
-public class IndexController { ;
+public class IndexController {
+
     @Autowired
     TAdminService adminService;
+
     @Autowired
     TEquipmentService equipmentService;
+
     @Autowired
     TEquipmentApplyService equipmentApplyService;
+
     @Autowired
     TProductService productService;
+
     @Autowired
     TProportionService proportionService;
+
     @Autowired
     TEquipmentDescService equipmentDescService;
+
     @Autowired
     EsTEquipmentService esTEquipmentService;
+
     @Autowired
     TParametersService parametersService;
+
     @Autowired
     TPriceService priceService;
+
     @Autowired
     TPromoCodeService promoCodeService;
+
+    @Autowired
+    TDiyFlowerService diyFlowerService;
+
     @Autowired
     private AmqpAdmin amqpAdmin;
+
     @ApiOperation(value = "心跳")
-//    @PostMapping("/heart.htm")
     @RequestMapping(value = "/heart.htm", method = RequestMethod.POST, produces = "text/html;charset=utf-8")
     @ResponseBody
     public String heart(@RequestBody EquipmentVo equipmentVo) {
@@ -173,10 +187,8 @@ public class IndexController { ;
                 equipmentDesc.setOutsideTm(outsideTm);
             }
             equipmentDescService.updateById(equipmentDesc);
-//            return JsonMessage.success("心跳成功");
             return "心跳成功";
         }
-//        return JsonMessage.error("心跳失败");
         return "心跳失败";
     }
     /**
@@ -332,8 +344,6 @@ public class IndexController { ;
                                         //从18种变成30种花型
                                         saveProductMG12(equipment.getId());
                                     }
-                                    //从18种变成30种花型
-//                                    saveProductMG12(equipment.getId());
                                 }
                                 equipment.setEquimentType("MG320");
                             }
@@ -352,10 +362,6 @@ public class IndexController { ;
                                     proportionService.removeById(proportion.getId());
                                 }
                             }
-//                            if(String.valueOf(adminId).equals("3")||String.valueOf(adminId).equals("31")||String.valueOf(adminId).equals("506")||String.valueOf(adminId).equals("1090")){
-//                                //自动设置分销
-//                                setProportion(adminId,equipment.getId(),clientId);
-//                            }
                             try {
                                 esTEquipmentService.updateDataById(equipment);
                             }catch (Exception e) {
@@ -399,12 +405,6 @@ public class IndexController { ;
                             }else {
                                 equipment.setEquimentType(equimentType);
                             }
-//                            if(equimentType.equals("MG330")){
-//                                equipment.setEquipmentType("MG330");
-//                            }
-//                            if(equimentType.equals("POP320")){
-//                                equipment.setEquipmentType(equipmentType);
-//                            }
                             if(!StringUtils.isEmpty(equimentType)&&equimentType.equals("MG280")){
                                 Long monthBegin = getMonthBegin(new Date());
                                 long time = System.currentTimeMillis();
@@ -426,17 +426,10 @@ public class IndexController { ;
                                 equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
                                 PushUtils.push(equipmentApply.getGtClientId(), "【爆米花】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
                             }
-//                            Equipment byClientId = equipmentService.findByClientId(equipment.getClientId());
-//                            String data = com.alibaba.fastjson.JSON.toJSONString(byClientId);
                             LambdaQueryWrapper<TEquipment> query3 = Wrappers.lambdaQuery();
                             query3.eq(TEquipment::getClientId,clientId);
                             TEquipment tEquipment = equipmentService.getOne(query3);
-//                            List<TEquipment> list1 = equipmentService.list(query3);
                             try {
-//                                if(list1.size()>0){
-//                                    TEquipment tEquipment = list1.get(0);
-//                                    esTEquipmentService.insertData(tEquipment);
-//                                }
                                 if(tEquipment != null) {
                                     esTEquipmentService.insertData(tEquipment);
                                 }
@@ -448,13 +441,10 @@ public class IndexController { ;
                             equipmentDescService.save(equipmentDesc);
                         }
                         //获取设备的id
-//                        Long equipmentId = equipmentService.findByClientId(clientId).getId();
                         LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
                         query1.eq(TEquipment::getClientId,clientId);
-//                        List<TEquipment> list1 = equipmentService.list(query1);
                         TEquipment equipment = equipmentService.getOne(query1);
                         Long equipmentId = equipment.getId();
-//                        if (!productService.exists(Filter.eq("equipmentId", equipmentId))) {
                         if(StringUtils.isEmpty(machineType) || machineType.equals("0")) {
                             if(equipmentApply.getEquimentType()!=null&&equipmentApply.getEquimentType().equals("MG280")){
                                 saveProductMG280(equipmentId);
@@ -476,7 +466,6 @@ public class IndexController { ;
                     } else if (status.equals("rejected")) {
                         equipmentApply.setStatusType(2);
                         equipmentService.sentMessage(equipmentApply.getClientId(),PushUtils.buildJson("statusType", "rejected").toString());
-//                        PushUtils.push(equipmentApply.getGtClientId(), "【棉花糖】设备初始化申请", "拒绝", PushUtils.buildJson("statusType", "rejected").toString());
                     }
                     equipmentApplyService.updateById(equipmentApply);
                 }
@@ -512,11 +501,6 @@ public class IndexController { ;
                         case 2:
                             equipmentProportion.setProportion(adminProportion.getMerchantProportion());
                             equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
-//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
-//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
-//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
-//                                        equipmentProportion.setAgencyName(byId.getUsername());
-//                                    }
                             equipmentProportion.setAgencyId(adminProportion.getAgencyId());
                             TAdmin byId = adminService.getById(adminProportion.getAgencyId());
                             equipmentProportion.setAgencyName(byId.getUsername());
@@ -527,20 +511,10 @@ public class IndexController { ;
                         case 3:
                             equipmentProportion.setProportion(adminProportion.getPersonageProportion());
                             equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
-//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
-//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
-//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
-//                                        equipmentProportion.setAgencyName(byId.getUsername());
-//                                    }
                             equipmentProportion.setAgencyId(adminProportion.getAgencyId());
                             TAdmin byId1 = adminService.getById(adminProportion.getAgencyId());
                             equipmentProportion.setAgencyName(byId1.getUsername());
                             equipmentProportion.setMerchantProportion(adminProportion.getMerchantProportion());
-//                                    if(adminProportion.getMerchantProportion().compareTo(new BigDecimal("0.00"))!=0){
-//                                        equipmentProportion.setMerchantId(admin.getMerchantId());
-//                                        TAdmin byId = adminService.getById(admin.getMerchantId());
-//                                        equipmentProportion.setMerchantName(byId.getUsername());
-//                                    }
                             equipmentProportion.setMerchantId(adminProportion.getMerchantId());
                             TAdmin byId2 = adminService.getById(adminProportion.getMerchantId());
                             equipmentProportion.setMerchantName(byId2.getUsername());
@@ -732,6 +706,7 @@ public class IndexController { ;
         // 获取本月第一天的时间戳
         return c.getTimeInMillis();
     }
+
     public static Date nextMonthDate() {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_MONTH,10);
@@ -799,6 +774,7 @@ public class IndexController { ;
             return "error";
         }
     }
+
     /**
      * 设备类型  开机时上传
      *
@@ -816,10 +792,9 @@ public class IndexController { ;
             equipment.setEquimentType(equimentType);
             equipmentService.updateById(equipment);
         }
-
-//        return JsonMessage.success("success");
         return "success";
     }
+
     /**
      * 设备地址  开机时上传
      * @param clientId  个推
@@ -836,12 +811,11 @@ public class IndexController { ;
             equipment.setLongitude(Double.valueOf(longitude));
             equipment.setFullName(fullName+"-");
             equipmentService.updateById(equipment);
-//            return JsonMessage.success("success");
             return "success";
         }
-//        return JsonMessage.success("error");
         return "error";
     }
+
     /**
      * 商品调价
      */
@@ -886,12 +860,15 @@ public class IndexController { ;
 
         return "调价成功";
     }
+
     public Double tran(Double d){
         return new BigDecimal(d).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
+
     public Double tran2(Double d){
         return new BigDecimal(d).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
+
     /**
      * 密码修改
      *
@@ -917,14 +894,13 @@ public class IndexController { ;
                         break;
                 }
                 equipmentService.updateById(equipment);
-//                return JsonMessage.success("更新密码成功");
                 return "更新密码成功";
             }
 
         }
-//        return JsonMessage.error("更新密码失败");
         return "更新密码失败";
     }
+
     /**
      * 设备获取密码
      */
@@ -946,6 +922,7 @@ public class IndexController { ;
         jsonObject.put("errmsg", "");
         return jsonObject.toJSONString();
     }
+
     /**
      * 修改支付方式
      *
@@ -1037,7 +1014,6 @@ public class IndexController { ;
         }
     }
 
-
     /**
      * 脱离系统
      *
@@ -1061,6 +1037,7 @@ public class IndexController { ;
         equipmentService.updateById(equipment);
         return "脱离成功";
     }
+
     /**
      * 脱离系统
      *
@@ -1085,8 +1062,6 @@ public class IndexController { ;
         return "脱离成功";
     }
 
-
-
     /**
      * 修改设备联系人名称以及电话
      */
@@ -1121,6 +1096,7 @@ public class IndexController { ;
         equipmentService.updateById(equipment);
         return "修改成功";
     }
+
     /**
      * 获取二维码图片
      */
@@ -1135,6 +1111,7 @@ public class IndexController { ;
         }
         return "400";
     }
+
     /**
      * 上传4G卡号
      */
@@ -1145,14 +1122,13 @@ public class IndexController { ;
         query.eq(TEquipment::getClientId,clientId);
         TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
         }
         equipment.setSimNo(simNo);
         equipmentService.updateById(equipment);
-//        return JsonMessage.success("修改成功");
         return "修改成功";
     }
+
     /**
      * 上传机器的apk版本
      */
@@ -1169,6 +1145,7 @@ public class IndexController { ;
         equipmentService.updateById(equipment);
         return "success";
     }
+
     /**
      * 上传机器的做糖状态
      */
@@ -1187,6 +1164,7 @@ public class IndexController { ;
         equipmentDescService.updateById(equipmentDesc);
         return "success";
     }
+
     /**
      * 修改设备状态
      *
@@ -1210,6 +1188,7 @@ public class IndexController { ;
         }
         return "修改成功";
     }
+
     /**
      * 新修改设备状态
      *
@@ -1224,7 +1203,6 @@ public class IndexController { ;
         query.eq(TEquipment::getClientId,clientId);
         TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
         }
         if(eqeStatus!=null){
@@ -1232,9 +1210,9 @@ public class IndexController { ;
             equipment.setEqeStatus(eqeStatus);
             equipmentService.updateById(equipment);
         }
-//        return JsonMessage.success("修改成功");
         return "修改成功";
     }
+
     /**
      * 修改设备锁定状态
      *
@@ -1249,7 +1227,6 @@ public class IndexController { ;
         query.eq(TEquipment::getClientId,clientId);
         TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return JsonMessage.error("该设备不存在");
             return "该设备不存在";
         }
         equipment.setIsBlocked(block);
@@ -1385,15 +1362,8 @@ public class IndexController { ;
         query.eq(TEquipment::getClientId,clientId);
         TEquipment equipment = equipmentService.getOne(query);
         if (equipment == null) {
-//            return JsonMessage.error("设备不存在");
             return "设备不存在";
         }
-//        ArrayList<Filter> filters = new ArrayList<>();
-//        filters.add(Filter.eq("status", code));
-//        filters.add(Filter.eq("clientId", clientId));
-//        filters.add(Filter.eq("equipmentId", equipment.getId()));
-//        filters.add(Filter.eq("name", name));
-//        List<Parameters> list = parametersService.findList(null, filters, null);
         LambdaQueryWrapper<TParameters> queryParameters = Wrappers.lambdaQuery();
         queryParameters.eq(TParameters::getClientId,clientId);
         queryParameters.eq(TParameters::getStatus,code);
@@ -1409,6 +1379,7 @@ public class IndexController { ;
 
         return "修改成功";
     }
+
     /**
      * 获取机器列表
      */
@@ -1426,7 +1397,6 @@ public class IndexController { ;
             jsonObject.put("errmsg", "name为空");
             return jsonObject.toJSONString();
         }
-//        Admin admin = adminService.find(Long.valueOf(adminId));
         TAdmin admin = adminService.getById(adminId);
         if(!admin.getUsername().equals(name)){
             jsonObject.put("code", 1);
@@ -1437,7 +1407,6 @@ public class IndexController { ;
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getAdminId,Long.valueOf(adminId));
         List<TEquipment> equipmentList = equipmentService.list(query);
-//        List<TEquipment> equipmentList = equipmentService.findByAdminId(Long.valueOf(adminId));
         for(TEquipment equipment:equipmentList){
             EquipmentDTO equipmentDTO = new EquipmentDTO();
             equipmentDTO.setClientId(equipment.getClientId());
@@ -1474,27 +1443,21 @@ public class IndexController { ;
             jsonObject.put("errmsg", "clientId为空");
             return jsonObject.toJSONString();
         }
-//        KafkaProperties.Admin admin = adminService.find(Long.valueOf(adminId));
         TAdmin admin = adminService.getById(Long.valueOf(adminId));
 
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
         TEquipment equipment = equipmentService.getOne(query);
-//        Equipment equipment = equipmentService.findByClientId(clientId);
 
         if(!equipment.getAdminId().toString().equals(admin.getId().toString())){
             jsonObject.put("code", 1);
             jsonObject.put("errmsg", "clientId与adminId不匹配");
             return jsonObject.toJSONString();
         }
-//        ArrayList<Filter> filters = new ArrayList<>();
-//        filters.add(Filter.eq("equipmentId", equipment.getId()));
-//        List<Product> products = productService.findList(null, filters, null);
         List<String> list = new ArrayList<>();
         LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
         queryProduct.eq(TProduct::getEquipmentId,equipment.getId());
         List<TProduct> products = productService.list(queryProduct);
-//        TProduct tProduct = products.get(0);
         for (TProduct product:products){
             list.add(product.getProductName());
         }
@@ -1524,58 +1487,16 @@ public class IndexController { ;
         LambdaQueryWrapper<TProduct> queryProduct = Wrappers.lambdaQuery();
         queryProduct.eq(TProduct::getEquipmentId,equipment.getId());
         List<TProduct> products = productService.list(queryProduct);
-//        TProduct tProduct = products.get(0);
         for (TProduct product:products){
             product.setCreateDate(null);
             product.setModifyDate(null);
         }
-//        jsonObject.put("code", 0);
-//        jsonObject.put("productions", JsonUtils.toJson(list));
-//        jsonObject.put("errmsg", "");
-//        jsonObject.put("total", list.size());
-//        return jsonObject.toJSONString();
         JSONObject jsonObject1 = new JSONObject();
         jsonObject1.put("code", 0);
         jsonObject1.put("data", JSONObject.toJSON(products).toString());
         jsonObject1.put("errmsg", "");
-//        return jsonObject1.toString();
         return JSONObject.toJSON(products).toString();
     }
-//    @ApiOperation(value = "分页查询")
-//    @GetMapping("/testPage")
-//    public ResponseModel<IPage<?>> testPage(TAdminParam param) {
-//        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-//        query.eq(TAdmin::getIsEnabled,true);
-//        if(StrUtil.isNotBlank(param.getName())){
-//            query.like(TAdmin::getName,param.getName());
-//        }
-//        query.orderByDesc(TAdmin::getApplyStartTime);
-//        Page<TAdmin> page = new Page<>(param.getCurrent(), param.getSize(), true);
-//        IPage<TAdmin> iPage = tAdminService.page(page, query);
-//        return R.ok(iPage);
-//    }
-//
-//    @ApiOperation(value = "列表查询")
-//    @GetMapping("/testList")
-//    public ResponseModel<List<?>> testList(TAdminParam param) {
-//        LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-//        query.eq(TAdmin::getIsEnabled,true);
-//        if(StrUtil.isNotBlank(param.getName())){
-//            query.like(TAdmin::getName,param.getName());
-//        }
-//        query.orderByDesc(TAdmin::getApplyStartTime);
-//        List<TAdmin> list = tAdminService.list(query);
-//        return R.ok(list);
-//    }
-//    @ApiOperation(value = "返回失败")
-//    @GetMapping("/testError")
-//    public ResponseModel<List<?>> testError(boolean success) {
-//        if(success){
-//            return R.ok();
-//        }else{
-//            return R.fail(ResponseCodesEnum.B0001,"你的错误信息");
-//        }
-//    }
 
     /**
      *是否启用物料监控功能
@@ -1626,6 +1547,7 @@ public class IndexController { ;
         promoCodeService.updateById(promoCode);
         return "success";
     }
+
     //验证优惠码
     @RequestMapping(value = "/selectCode.htm", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
     @ResponseBody
@@ -1641,7 +1563,6 @@ public class IndexController { ;
         TPromoCode promoCode = new TPromoCode();
         if (codeList.size() == 0) {
             //不存在
-//            return JsonMessage.success("1");
             return "1";
         }
         for (TPromoCode cod : codeList) {
@@ -1657,7 +1578,6 @@ public class IndexController { ;
         }
         if(promoCode.getAdminId()==null){
             //不是本机
-//            return JsonMessage.success("3");
             return "3";
         }
         Date lastUseDate = null;
@@ -1669,17 +1589,14 @@ public class IndexController { ;
             promoCode.setIsUse("2");
             promoCodeService.updateById(promoCode);
             //过期
-//            return JsonMessage.success("4");
             return "4";
         }
         if (promoCode.getId() == null) {
             //不存在
-//            return JsonMessage.success("1");
             return "1";
         }
         if (promoCode.getIsUse().equals("1")) {
             //被使用
-//            return JsonMessage.success("2");
             return "2";
         }
         if(!promoCode.getAdminId().equals("1")){
@@ -1687,23 +1604,20 @@ public class IndexController { ;
 
             } else {
                 //不是本机
-//                return JsonMessage.success("3");
                 return "3";
             }
         }
         if (promoCode.getDiscount() == null) {
             //旧优惠码
-//            return JsonMessage.success("0");
             return "0";
         }
         if (promoCode.getDiscount() != null && promoCode.getDiscount() == 0) {
             //0折
-//            return JsonMessage.success("0");
             return "0";
         }
-//        return JsonMessage.success("success");
         return "success";
     }
+
     //修改机器的分销
     @RequestMapping(value = "/updateProportion.htm", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
     @ResponseBody
@@ -1762,11 +1676,6 @@ public class IndexController { ;
                                 case 2:
                                     equipmentProportion.setProportion(adminProportion.getMerchantProportion());
                                     equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
-//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
-//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
-//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
-//                                        equipmentProportion.setAgencyName(byId.getUsername());
-//                                    }
                                     equipmentProportion.setAgencyId(admin.getAgencyId());
                                     TAdmin byId = adminService.getById(admin.getAgencyId());
                                     equipmentProportion.setAgencyName(byId.getUsername());
@@ -1777,20 +1686,10 @@ public class IndexController { ;
                                 case 3:
                                     equipmentProportion.setProportion(adminProportion.getPersonageProportion());
                                     equipmentProportion.setAgencyProportion(adminProportion.getAgencyProportion());
-//                                    if(adminProportion.getAgencyProportion().compareTo(new BigDecimal("0.00"))!=0){
-//                                        equipmentProportion.setAgencyId(admin.getAgencyId());
-//                                        TAdmin byId = adminService.getById(admin.getAgencyId());
-//                                        equipmentProportion.setAgencyName(byId.getUsername());
-//                                    }
                                     equipmentProportion.setAgencyId(admin.getAgencyId());
                                     TAdmin byId1 = adminService.getById(admin.getAgencyId());
                                     equipmentProportion.setAgencyName(byId1.getUsername());
                                     equipmentProportion.setMerchantProportion(adminProportion.getMerchantProportion());
-//                                    if(adminProportion.getMerchantProportion().compareTo(new BigDecimal("0.00"))!=0){
-//                                        equipmentProportion.setMerchantId(admin.getMerchantId());
-//                                        TAdmin byId = adminService.getById(admin.getMerchantId());
-//                                        equipmentProportion.setMerchantName(byId.getUsername());
-//                                    }
                                     equipmentProportion.setMerchantId(admin.getMerchantId());
                                     TAdmin byId2 = adminService.getById(admin.getMerchantId());
                                     equipmentProportion.setMerchantName(byId2.getUsername());
@@ -1809,6 +1708,7 @@ public class IndexController { ;
         }
         return "success";
     }
+
     /**
      *
      *
@@ -1839,6 +1739,7 @@ public class IndexController { ;
         }
         return "error";
     }
+
     /**
      * 修改优惠券开关状态
      *
@@ -2006,34 +1907,94 @@ public class IndexController { ;
     }
 
     /**
-     * 修改机型
-     * @param clientId
-     * @param equipmentType
+     * 上传DIY花型功能开关状态
+     * @param clientId:设备编号
+     * @param DIYFlowerStatus:开关状态, 0: 关闭, 1: 开启
      * @return
      */
-    @GetMapping(value = "/updateEquipmentType")
+    @GetMapping(value = "/updateDIYFlowerStatus")
     @ResponseBody
-    public String updateEquipmentType(String clientId,String equipmentType){
-        if(StringUtils.isNotEmpty(clientId)&&StringUtils.isNotEmpty(equipmentType)){
-            // 删除MQ队列
-            amqpAdmin.deleteQueue(clientId);
-            // 重新创建队列
-            Map<String,Object> arg = new HashMap<>();
-            arg.put("x-message-ttl",1800000);
-            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
-            amqpAdmin.declareBinding(new Binding(clientId,
-                    Binding.DestinationType.QUEUE,
-                    equipmentType, clientId, objectObjectHashMap));
+    public String updateDIYFlowerStatus(String clientId, String DIYFlowerStatus){
+        if(StringUtils.isNotEmpty(clientId)&&StringUtils.isNotEmpty(DIYFlowerStatus)){
             LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
             query.eq(TEquipment::getClientId,clientId);
             TEquipment equipment = equipmentService.getOne(query);
-            equipment.setEquimentType(equipmentType);
-            equipmentService.updateById(equipment);
+            TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
+            equipmentDesc.setDiyFlowerStatus(DIYFlowerStatus);
+            equipmentDescService.updateById(equipmentDesc);
+            // 如果为开启状态
+            if (DIYFlowerStatus.equals("1")) {
+                LambdaQueryWrapper<TDiyFlower> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.eq(TDiyFlower::getEquipmentId, equipment.getId());
+                List<TDiyFlower> list = diyFlowerService.list(queryWrapper);
+                // 如何为空就添加新的花型形状和颜色
+                if (list.size() == 0) {
+                    saveDIYProduct(equipment.getId());
+                }
+            }
             return "success";
         }
         return "error";
     }
 
+    /**
+     * 添加DIY花型产品
+     * @param id
+     */
+    private void saveDIYProduct(Long id) {
+        String[] str = {"圆五花-S01", "圆心-S02", "心-S03", "圆蝴蝶-S04", "圆四叶草-S05", "圆六花瓣-S06", "圆三叶草-A07", "圆三花瓣-S08", "圆蘑菇-S09",
+                "白糖-T01", "红糖-T02", "黄糖-T03", "蓝糖-T04"};
+
+        for (int i = 0; i < str.length; i++) {
+            TDiyFlower diyFlower = new TDiyFlower();
+            diyFlower.setCreateDate(new Date());
+            diyFlower.setModifyDate(new Date());
+            diyFlower.setEquipmentId(id);
+            String[] split = str[i].split("-");
+            diyFlower.setName(split[0]);
+            diyFlower.setNo(split[1]);
+            diyFlower.setShowType("1");
+            diyFlowerService.save(diyFlower);
+        }
+
+    }
+
+    /**
+     * 上传DIY花型形状/糖显示状态
+     * @param clientId 设备编号
+     * @param tProductBean 包含形状/糖的编号和状态
+     * @return
+     */
+    @RequestMapping(value = "/updateDIYFlowerShow", method = RequestMethod.POST)
+    @ResponseBody
+    public String updateDIYFlowerShow(@RequestParam String clientId, @RequestBody List<TProductBean> tProductBean) {
+        if(StringUtils.isEmpty(clientId)||tProductBean == null) {
+            return "参数为空";
+        }
+        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+        query.eq(TEquipment::getClientId,clientId);
+        TEquipment equipment = equipmentService.getOnly(query);
+        if (equipment==null) {
+            return "找不到设备信息";
+        }
+        Long equipmentId = equipment.getId();
+        ArrayList<TDiyFlower> diyFlowers = new ArrayList<>();
+        for (TProductBean productBean : tProductBean) {
+            String no = productBean.getNo();
+            String showType = productBean.getShowType();
+            LambdaQueryWrapper<TDiyFlower> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(TDiyFlower::getEquipmentId,equipmentId);
+            wrapper.eq(TDiyFlower::getNo,no);
+            TDiyFlower diyFlower = diyFlowerService.getOne(wrapper);
+            diyFlower.setShowType(showType);
+            diyFlowers.add(diyFlower);
+        }
+        boolean res = diyFlowerService.updateBatchById(diyFlowers);
+        if (!res) {
+            return "error";
+        }
+        return "success";
+    }
 
 }
 

+ 23 - 0
src/main/java/com/szwl/controller/TAdminController.java

@@ -985,5 +985,28 @@ public class TAdminController {
         tAdminService.update(null, updateWrapper);
         return R.ok();
     }
+
+    @ApiOperation(value = "一键迁移")
+    @GetMapping("/oneKeyMigration")
+    public ResponseModel<?> oneKeyMigration(Long adminId) {
+        LambdaQueryWrapper<SysRole> query4 = Wrappers.lambdaQuery();
+        query4.eq(SysRole::getAdminId, "1");
+        query4.eq(SysRole::getRoleName, "商家");
+        List<SysRole> list2 = sysRoleService.list(query4);
+        if (list2.size() > 0) {
+            SysRole sysRole = list2.get(0);
+            SysRole newSysRole = new SysRole();
+            newSysRole.setAdminId(adminId);
+            newSysRole.setMenuCodesJson(sysRole.getMenuCodesJson());
+            newSysRole.setRoleName("商家");
+            sysRoleService.save(newSysRole);
+            SysUserRole sysUserRole = new SysUserRole();
+            sysUserRole.setRoleId(newSysRole.getRoleId());
+            sysUserRole.setUserId(String.valueOf(adminId));
+            boolean save = sysUserRoleService.save(sysUserRole);
+            return R.ok("success");
+        }
+        return R.fail(ResponseCodesEnum.A0001,"fail");
+    }
 }
 

+ 0 - 10
src/main/java/com/szwl/controller/TEquipmentApplyController.java

@@ -178,18 +178,11 @@ public class TEquipmentApplyController {
                                         //从18种变成30种花型
                                         saveProductMG12(equipment.getId());
                                     }
-                                    //从18种变成30种花型
-//                                    saveProductMG12(equipment.getId());
                                 }
                                 equipment.setEquimentType("MG320");
                             } else {
                                 equipment.setEquimentType(equimentType);
                             }
-//                            if(equipmentApply.getEquimentType().equals("MG330")){
-//                                equipment.setEquimentType("MG330");
-//                            }
-//                            if(equipmentApply.getEquimentType().equals("POP320")) {
-//                            }
 
                             equipmentService.updateById(equipment);
                             LambdaQueryWrapper<TProportion> queryProportion = Wrappers.lambdaQuery();
@@ -243,9 +236,6 @@ public class TEquipmentApplyController {
                         }else {
                             equipment.setEquimentType(equimentType);
                         }
-//                        if(equipmentApply.getEquimentType().equals("MG330")){
-//                            equipment.setEquimentType("MG330");
-//                        }
                         if(!StringUtils.isEmpty(equimentType)&&equimentType.equals("MG280")){
                             Long monthBegin = getMonthBegin(new Date());
                             long time = System.currentTimeMillis();

+ 66 - 27
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gexin.fastjson.JSON;
 import com.szwl.annotation.Audit;
 import com.szwl.constant.AuditEnum;
 import com.szwl.constant.ResponseCodesEnum;
@@ -63,28 +64,40 @@ import static com.szwl.constant.ResponseCodesEnum.*;
 @RestController
 @RequestMapping("/tEquipment")
 public class TEquipmentController {
+
     @Autowired
     TEquipmentService tEquipmentService;
+
     @Autowired
     TEquipmentDescService equipmentDescService;
+
     @Autowired
     TAdminService tAdminService;
+
     @Autowired
     TParametersService parametersService;
+
     @Autowired
     TAlarmRecordService tAlarmRecordService;
+
     @Autowired
     TAreaService tAreaService;
+
     @Autowired
     TOrderService tOrderService;
+
     @Autowired
     TAdminEquipmentService tAdminEquipmentService;
 
+    @Autowired
+    TDiyFlowerService tDiyFlowerService;
+
     TokenManager tokenManager;
 
     private int j;
 
-    private static final int TIMEOUT = 30000;  // 超时时间为30秒
+    // 超时时间为30秒
+    private static final int TIMEOUT = 30000;
 
     /**
      * @param adminName     商户的登录名
@@ -299,19 +312,15 @@ public class TEquipmentController {
         return R.ok(equipment);
     }
 
-    //查找设备
     @ApiOperation(value = "ClientId查找设备")
     @GetMapping("/findEquipmentByClientId")
     public ResponseModel<TEquipment> findEquipmentByClientId(@RequestParam String clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId, clientId);
-//        List<TEquipment> list = tEquipmentService.list(query);
-//        TEquipment equipment = list.get(0);
         TEquipment equipment = tEquipmentService.getOnly(query);
         return R.ok(equipment);
     }
 
-    //查找设备
     @ApiOperation(value = "获取对应的机器id")
     @GetMapping("/getClientIdList")
     public ResponseModel<TAdminEquipment> getClientIdList(@RequestParam String adminId) {
@@ -321,7 +330,6 @@ public class TEquipmentController {
         return R.ok(adminEquipment);
     }
 
-    //查找设备
     @ApiOperation(value = "获取对应的机器编号")
     @GetMapping("/getClientIds")
     public ResponseModel<List<String>> getClientIds(@RequestParam String adminId) {
@@ -350,7 +358,6 @@ public class TEquipmentController {
         return R.ok(iPage);
     }
 
-    //查找设备
     @ApiOperation(value = "adminId查找设备")
     @GetMapping("/listEquipment")
     public ResponseModel<?> listEquipment(String adminId) {
@@ -417,7 +424,6 @@ public class TEquipmentController {
      * 更新
      */
     @ApiOperation(value = "更新机器")
-//    @PostMapping("/update")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public ResponseModel<?> update(@RequestBody TEquipmentDTO equipment) {
         //获取修改前的设备
@@ -656,7 +662,6 @@ public class TEquipmentController {
 
     }
 
-    //修改机器信息
     @ApiOperation(value = "修改机器信息")
     @PostMapping("/updateEquipment")
     public ResponseEntity<?> updateEquipment(@RequestBody TEquipment equipment) {
@@ -703,7 +708,6 @@ public class TEquipmentController {
 
     }
 
-    //根据机器id获取用户信息
     @ApiOperation(value = "根据机器id获取用户信息")
     @PostMapping("/findByEquipment")
     public ResponseEntity<?> findByEquipment(@RequestBody TEquipment equipment) {
@@ -713,7 +717,6 @@ public class TEquipmentController {
                 .body(new ResultMessage().setCode(false).setData(tAdmin).setMessage(""));
     }
 
-    //根据机器编号获取用户信息
     @ApiOperation(value = "根据机器编号获取用户信息")
     @PostMapping("/getEquipmentListLikeClientId")
     public ResponseEntity<?> getEquipmentListLikeClientId(@RequestBody TEquipment equipment) {
@@ -728,13 +731,10 @@ public class TEquipmentController {
                 .body(new ResultMessage().setCode(true).setData(list).setMessage(""));
     }
 
-    //脱机
     @ApiOperation(value = "脱机")
     @PostMapping("/tuoji")
-    @Audit(type = AuditEnum.OFFLINE, content = "#loginUser.name + '对设备' +  #equipment.clientId + '进行了脱机操作'")
+    @Audit(type = AuditEnum.OFFLINE, content = "#equipment.adminUserName + '对设备' +  #equipment.clientId + '进行了脱机操作'")
     public ResponseEntity<?> tuoji(@RequestBody TEquipment equipment) {
-        //获取当前操作人员
-        UserDetailBO loginUser = tokenManager.getLoginUserDetails();
         if (equipment.getId() == null) {
             return ResponseEntity.status(HttpStatus.OK)
                     .body(new ResultMessage().setCode(false).setData("").setMessage(""));
@@ -751,7 +751,6 @@ public class TEquipmentController {
                 .body(new ResultMessage().setCode(true).setData("").setMessage("发送成功!"));
     }
 
-    //一键补料
     @ApiOperation(value = "一键补料")
     @GetMapping("/buliao")
     public ResponseModel<?> buliao(String equipmentId) {
@@ -777,7 +776,6 @@ public class TEquipmentController {
         return R.ok(null, "发送请求成功");
     }
 
-    //
     @ApiOperation(value = "修改优惠券开关状态")
     @GetMapping("/updateCouponStatus")
     public ResponseModel<?> updateCouponStatus(String equipmentId, String couponStatus) {
@@ -797,7 +795,6 @@ public class TEquipmentController {
         return R.ok(null, "修改成功");
     }
 
-    //查找设备
     @ApiOperation(value = "查找设备")
     @PostMapping("/findEquipment")
     public ResponseEntity<?> findEquipment(@RequestBody TEquipment equipment) {
@@ -806,7 +803,6 @@ public class TEquipmentController {
                 .body(new ResultMessage().setCode(false).setData(tEquipment).setMessage(""));
     }
 
-    //获取机器数量
     @ApiOperation(value = "获取机器数量")
     @PostMapping("/getMachineNum")
     public ResponseModel<?> getMachineNum(@RequestBody StatisticsParam param) {
@@ -885,7 +881,6 @@ public class TEquipmentController {
         return R.ok(null, "修改成功");
     }
 
-    //远程开门
     @ApiOperation(value = "远程开门")
     @PostMapping("/openDoor")
     public ResponseEntity<?> openDoor(@RequestBody StatisticsParam param) {
@@ -921,8 +916,6 @@ public class TEquipmentController {
         return R.ok(null, "修改成功");
     }
 
-
-    //查看是否远程来关机成功
     @ApiOperation(value = "查看是否远程来关机成功")
     @PostMapping("/checkStatus")
     public ResponseEntity<?> checkStatus(@RequestBody StatisticsParam param) {
@@ -990,7 +983,6 @@ public class TEquipmentController {
         return time;
     }
 
-    //机器睡眠
     @ApiOperation(value = "机器睡眠")
     @PostMapping("/sleep")
     public ResponseEntity<?> sleep(@RequestBody StatisticsParam param) {
@@ -1021,7 +1013,6 @@ public class TEquipmentController {
                         .setMessage("SUCCESS"));
     }
 
-    // 获取机器开关机状态
     @ApiOperation(value = "获取机器开关机状态")
     @PostMapping("/onoffStatus")
     public ResponseEntity<?> onoffStatus(@RequestBody StatisticsParam param) {
@@ -1038,7 +1029,6 @@ public class TEquipmentController {
                         .setMessage("SUCCESS"));
     }
 
-    // 获取所有机器开关机状态
     @ApiOperation(value = "获取所有机器开关机状态")
     @PostMapping("/equipmentStatus")
     public ResponseEntity<?> equipmentStatus(@RequestBody StatisticsParam param) {
@@ -1069,7 +1059,6 @@ public class TEquipmentController {
                         .setMessage("SUCCESS"));
     }
 
-    // 检验所有机器是否开机
     @ApiOperation(value = "检验所有机器是否开机")
     @PostMapping("/checkEquipmentStatus")
     public ResponseEntity<?> checkEquipmentStatus(@RequestBody StatisticsParam param) {
@@ -1098,7 +1087,6 @@ public class TEquipmentController {
                         .setMessage("SUCCESS"));
     }
 
-    //机器开关机
     @ApiOperation(value = "机器开关机")
     @PostMapping("/onOff")
     public ResponseEntity<?> onOff(@RequestBody StatisticsParam param) {
@@ -1610,5 +1598,56 @@ public class TEquipmentController {
         List<TEquipment> list = tEquipmentService.list(wrapper);
         return R.ok(list);
     }
+
+    @ApiOperation(value = "修改DIY花型功能开关状态")
+    @GetMapping("/updateDIYFlowerStatus")
+    public ResponseModel<?> updateDIYFlowerStatus(String equipmentId, String DIYFlowerStatus) {
+        if (StringUtils.isEmpty(DIYFlowerStatus) || StringUtils.isEmpty(equipmentId)) {
+            return R.fail(ResponseCodesEnum.A0001, "参数有空");
+        }
+        TEquipment equipment = tEquipmentService.getById(equipmentId);
+        if (equipment == null || equipment.getId() == null) {
+            return R.fail(ResponseCodesEnum.A0001, "找不到设备");
+        }
+        TEquipmentDesc tEquipmentDesc = equipmentDescService.getById(equipment.getId());
+        if (tEquipmentDesc != null) {
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("DIYFlowerStatus", DIYFlowerStatus).toString());
+        } else {
+            return R.fail(ResponseCodesEnum.A0001, "找不到设备");
+        }
+        return R.ok(null, "发送成功");
+    }
+
+    @ApiOperation(value = "修改DIY花型的形状或是否显示")
+    @PostMapping("/updateDIYProductShow")
+    public ResponseModel<?> updateDIYProductShow(@RequestBody String productList) {
+        JSONObject jsonObject = JSONObject.parseObject(productList);
+        List<TDiyFlower> products = JSONObject.parseArray(jsonObject.get("productList").toString(), TDiyFlower.class);
+        if(products.size()>0){
+            TDiyFlower diyFlower = products.get(0);
+            if(diyFlower==null && diyFlower.getEquipmentId()==null){
+                return R.fail(ResponseCodesEnum.A0001,"找不到当前设备");
+            }
+        }
+        TEquipment equipment = tEquipmentService.getById(products.get(0).getEquipmentId());
+        if(equipment==null){
+            return R.fail(ResponseCodesEnum.A0001,"请退出重试");
+        }
+        List<TProductBean> list = new ArrayList<>();
+        for(TDiyFlower product:products){
+            TProductBean productBean = new TProductBean();
+            if(product!=null&&product.getId()!=null){
+                productBean.setShowType(product.getShowType());
+                if(StringUtils.isEmpty(product.getShowType())){
+                    productBean.setShowType("1");
+                }
+                productBean.setProductName(product.getName());
+                list.add(productBean);
+            }
+        }
+        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateDIYProductShow", JSON.toJSONString(list)).toString());
+//        tDiyFlowerService.updateBatchById(products);
+        return R.ok(null,"修改请求发送成功");
+    }
 }
 

+ 16 - 0
src/main/java/com/szwl/mapper/TDiyFlowerMapper.java

@@ -0,0 +1,16 @@
+package com.szwl.mapper;
+
+import com.szwl.model.entity.TDiyFlower;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-07
+ */
+public interface TDiyFlowerMapper extends BaseMapper<TDiyFlower> {
+
+}

+ 21 - 0
src/main/java/com/szwl/mapper/xml/TDiyFlowerMapper.xml

@@ -0,0 +1,21 @@
+<?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.szwl.mapper.TDiyFlowerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.szwl.model.entity.TDiyFlower">
+        <id column="id" property="id" />
+        <result column="create_date" property="createDate" />
+        <result column="modify_date" property="modifyDate" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="name" property="name" />
+        <result column="no" property="no" />
+        <result column="show_type" property="showType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, create_date, modify_date, equipment_id, name, no, show_type
+    </sql>
+
+</mapper>

+ 2 - 1
src/main/java/com/szwl/mapper/xml/TEquipmentDescMapper.xml

@@ -28,11 +28,12 @@
         <result column="candy_generator_tm" property="candyGeneratorTm" />
         <result column="outside_tm" property="outsideTm" />
         <result column="outside_hd" property="outsideHd" />
+        <result column="diy_flower_status" property="diyFlowerStatus" />
     </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, number_one, candy_generator_tm, outside_tm, outside_hd
+        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, diy_flower_status
     </sql>
 
 </mapper>

+ 50 - 0
src/main/java/com/szwl/model/entity/TDiyFlower.java

@@ -0,0 +1,50 @@
+package com.szwl.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="TDiyFlower对象", description="")
+public class TDiyFlower implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifyDate;
+
+    @ApiModelProperty(value = "设备ID")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "形状名称或者颜色")
+    private String name;
+
+    @ApiModelProperty(value = "编号")
+    private String no;
+
+    @ApiModelProperty(value = "是否显示")
+    private String showType;
+
+
+}

+ 4 - 1
src/main/java/com/szwl/model/entity/TEquipmentDesc.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-10-31
+ * @since 2023-11-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -95,5 +95,8 @@ public class TEquipmentDesc implements Serializable {
     @ApiModelProperty(value = "柜外湿度")
     private String outsideHd;
 
+    @ApiModelProperty(value = "DIY花型功能开关,0:关闭,1:开启")
+    private String diyFlowerStatus;
+
 
 }

+ 16 - 0
src/main/java/com/szwl/service/TDiyFlowerService.java

@@ -0,0 +1,16 @@
+package com.szwl.service;
+
+import com.szwl.model.entity.TDiyFlower;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-07
+ */
+public interface TDiyFlowerService extends IService<TDiyFlower> {
+
+}

+ 20 - 0
src/main/java/com/szwl/service/impl/TDiyFlowerServiceImpl.java

@@ -0,0 +1,20 @@
+package com.szwl.service.impl;
+
+import com.szwl.model.entity.TDiyFlower;
+import com.szwl.mapper.TDiyFlowerMapper;
+import com.szwl.service.TDiyFlowerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wuhs
+ * @since 2023-11-07
+ */
+@Service
+public class TDiyFlowerServiceImpl extends ServiceImpl<TDiyFlowerMapper, TDiyFlower> implements TDiyFlowerService {
+
+}