更新

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -21,7 +21,7 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
         // 自定义去除的路径
         String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tLogo/**",
                 "/tProportion/**","/tProduct/**","/tPromoCode/**", "/tProportionCheck/**", "/tProduct/selectProductList",  "/rabbitMqController/**","/tJoinpayMchCheck/**","/indexController/**","/sysRoleMenu/**",
-                "/tEquipmentApply/**","/tEquipment/**","/api/**","/tAdmin/**","/tNotice/**",
+                "/tEquipmentApply/**","/tEquipment/**","/api/**","/tAdmin/**","/tNotice/**","/tParameters/**",
                 "/tLabel/**","/tArea/**","/error"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger

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

@@ -55,5 +55,26 @@ public class ApkInfoController {
 //            return JsonMessage.error("没有版本数据");
             return "没有版本数据";
     }
-
+    /**
+     * 获得最新的更新数据
+     *
+     * @param model 型号
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getApkinfoList.htm", produces = "text/html;charset=utf-8")
+    public String getApkInfoList(String model) {
+        if (StringUtils.isEmpty(model)) {
+//            return JsonMessage.error("没有版本数据");
+            return "没有版本数据";
+        }
+        LambdaQueryWrapper<TApkInfo> query = Wrappers.lambdaQuery();
+        query.eq(TApkInfo::getModel,model);
+        query.orderByDesc(TApkInfo::getVersion);
+        List<TApkInfo> list = tApkInfoService.list(query);
+        if (list.size()>0) {
+            return JSONObject.toJSONString(list);
+        }
+        return "没有版本数据";
+    }
 }

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

@@ -1163,26 +1163,20 @@ public class IndexController { ;
      * @param
      * @return
      */
-    @PostMapping(value = "/updateParamNew.htm/{code}/{clientId}", produces = "text/html;charset=utf-8")
+    @RequestMapping(value = "/updateParamNew", method = RequestMethod.POST)
+//    @PostMapping(value = "/updateParamNew", produces = "text/html;charset=utf-8")
     @ResponseBody
-    public String updateParamNew(@PathVariable Integer code, @PathVariable String clientId, @RequestBody List<CommonParamVo> commonParamVos) {
+    public String updateParamNew(Integer code, String clientId, @RequestBody List<CommonParamVo> commonParamVos) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
         List<TEquipment> list = equipmentService.list(query);
         TEquipment equipment = list.get(0);
         if (equipment == null) {
-//            return JsonMessage.error("设备不存在");
             return "设备不存在";
         }
         if(commonParamVos.size()<=0){
-//            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()));
-//        List<Parameters> list = parametersService.findList(null, filters, null);
         LambdaQueryWrapper<TParameters> queryParameters = Wrappers.lambdaQuery();
         queryParameters.eq(TParameters::getClientId,clientId);
         queryParameters.eq(TParameters::getStatus,code);
@@ -1696,5 +1690,33 @@ public class IndexController { ;
     public String getYouHuiPrice(String clientId){
         return "5";
     }
+
+    /**
+     * 修改商品名称
+     *
+     * @param clientId 设备个推Id
+     * @param
+     * @return
+     * @Param
+     */
+    @RequestMapping(value = "/updateProductName.htm", method = RequestMethod.POST)
+    @ResponseBody
+    public String updateProductName(String clientId, Long productId,String oldProductName, String newProductName) {
+        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+        query.eq(TEquipment::getClientId,clientId);
+        List<TEquipment> list = equipmentService.list(query);
+        if(list.size()>0){
+            TEquipment equipment = list.get(0);
+            if (equipment != null&&equipment.getId()!=null) {
+                TProduct product = productService.getById(productId);
+                product.setName(oldProductName);
+                product.setProductName(newProductName);
+                productService.updateById(product);
+                return "修改成功success！";
+            }
+        }
+
+        return "更新失败error";
+    }
 }
 

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

@@ -81,9 +81,12 @@ public class RabbitMqController {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,routingKey);
         List<TEquipment> list = tEquipmentService.list(query);
-        TEquipment equipment = list.get(0);
-        equipment.setEquimentType(exchange);
-        tEquipmentService.updateById(equipment);
+        if(list.size()>0){
+            TEquipment equipment = list.get(0);
+            equipment.setEquimentType(exchange);
+            tEquipmentService.updateById(equipment);
+        }
+
 //        return JsonMessage.success("成功");
         return "成功";
     }
@@ -98,10 +101,11 @@ public class RabbitMqController {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
         List<TEquipment> list = tEquipmentService.list(query);
-        TEquipment equipment = list.get(0);
-        equipment.setChannel(type);
-        tEquipmentService.updateById(equipment);
-//        return JsonMessage.success("成功");
+        if(list.size()>0){
+            TEquipment equipment = list.get(0);
+            equipment.setChannel(type);
+            tEquipmentService.updateById(equipment);
+        }
         return "成功";
     }
 }

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

@@ -63,6 +63,9 @@ public class TAlarmClockController {
         Date date = new Date();
         alarmClock.setCreateDate(date);
         alarmClock.setModifyDate(date);
+        alarmClock.setEquipmentIds(alarmClock.getEquipmentIds()+",");
+        alarmClock.setWeek(alarmClock.getWeek()+",");
+        alarmClock.setHour(alarmClock.getHour()+":00");
         tAlarmClockService.save(alarmClock);
 //		sentMessageToEquiment(alarmClock.getType(),alarmClock.getEquipmentIds(),alarmClock.getAdminId());
         //避免返回大量数据

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

@@ -98,7 +98,7 @@ public class TEquipmentController {
         if(StringUtils.isNotEmpty(clientId)){
             query.eq(TEquipment::getClientId,clientId);
         }
-        if(StringUtils.isNotEmpty(adminName)){
+        if(StringUtils.isNotEmpty(adminName)&&!adminName.equals("admin")){
             LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
             adminQuery.eq(TAdmin::getUsername,adminName);
             List<TAdmin> list = tAdminService.list(adminQuery);
@@ -239,11 +239,9 @@ public class TEquipmentController {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         TAdmin admin = tAdminService.getById(adminId);
         Integer type = admin.getType();
-        if(type>1){
-            if(type==2){
-                query.eq(TEquipment::getAdminId,adminId);
-            }
+        query.eq(TEquipment::getAdminId,adminId);
             if(type==3){
+                query.eq(TEquipment::getAdminId,adminId);
                 //查找属于这个商家子账户的设备 todo
                 TAdminEquipment adminEquipment = tAdminEquipmentService.getById(admin.getId());
                 if(adminEquipment.getType().equals("0")){
@@ -255,7 +253,6 @@ public class TEquipmentController {
                     query.in(TEquipment::getId,equipmentIdList);
                 }
             }
-        }
 //        query.eq(TEquipment::getAdminId,adminId);
         List<TEquipment> list = tEquipmentService.list(query);
         return R.ok(list);
@@ -534,19 +531,14 @@ public class TEquipmentController {
     @ApiOperation(value = "修改机器音量")
     @PostMapping("/updateVolume")
     public ResponseEntity<?> updateVolume(@RequestBody TEquipment equipment) {
-        Boolean t = tEquipmentService.updateById(equipment);
-        if (t == true) {
+
             if(!StringUtils.isEmpty(equipment.getVolume())){
                 TEquipment tEquipment = tEquipmentService.getById(equipment.getId());
                 tEquipmentService.sentMessage(tEquipment.getClientId(),PushUtils.buildJson("volume", equipment.getVolume()).toString());
 //                PushUtils.push(tEquipment.getGtClientId(), "", "", PushUtils.buildJson("volume", equipment.getVolume()).toString());
             }
             return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(true).setData(t).setMessage("修改成功"));
-        } else {
-            return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(false).setData(t).setMessage("修改失败"));
-        }
+                    .body(new ResultMessage().setCode(true).setData(true).setMessage("修改成功"));
 
     }
     //修改机器信息

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

@@ -61,6 +61,9 @@ public class TJoinpayMchCheckController {
         if(type.equals("0")){
             //汇聚的审核信息
             LambdaQueryWrapper<TJoinpayMchCheck> query = Wrappers.lambdaQuery();
+            if(admin.getType()>1){
+                query.eq(TJoinpayMchCheck::getAdminId,admin.getId());
+            }
             if(StringUtils.isNotEmpty(username)){
                 LambdaQueryWrapper<TAdmin> query1 = Wrappers.lambdaQuery();
                 query1.eq(TAdmin::getUsername,username);
@@ -69,6 +72,7 @@ public class TJoinpayMchCheckController {
                     query.eq(TJoinpayMchCheck::getAdminId,list1.get(0).getId());
                 }
             }
+            query.orderByDesc(TJoinpayMchCheck::getCreateDate);
             query.eq(TJoinpayMchCheck::getType,"0");
             Page<TJoinpayMchCheck> page = new Page<>(current, size, true);
             IPage<TJoinpayMchCheck> iPage = tJoinpayMchCheckService.page(page, query);
@@ -77,6 +81,9 @@ public class TJoinpayMchCheckController {
         if(type.equals("1")) {
             //杉德的审核信息
             LambdaQueryWrapper<TShandeMchCheck> query = Wrappers.lambdaQuery();
+            if(admin.getType()>1){
+                query.eq(TShandeMchCheck::getAdminId,admin.getId());
+            }
             if(StringUtils.isNotEmpty(username)){
                 LambdaQueryWrapper<TAdmin> query1 = Wrappers.lambdaQuery();
                 query1.eq(TAdmin::getUsername,username);
@@ -85,6 +92,7 @@ public class TJoinpayMchCheckController {
                     query.eq(TShandeMchCheck::getAdminId,list1.get(0).getId());
                 }
             }
+            query.orderByDesc(TShandeMchCheck::getCreateDate);
             query.eq(TShandeMchCheck::getCheckType,"0");
             Page<TShandeMchCheck> page = new Page<>(current, size, true);
             IPage<TShandeMchCheck> iPage = tShandeMchCheckService.page(page, query);

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

@@ -130,6 +130,33 @@ public class TPromoCodeController {
             return R.fail(A0002,"没有找到优惠码");
         }
     }
+    @ApiOperation(value = "修改优惠码状态")
+    @GetMapping("/updateCode")
+    public ResponseModel<?> updateCode(String  clientId, String  code) {
+        if(StringUtils.isEmpty(clientId)){
+            return null;
+        }
+        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+        query.eq(TEquipment::getClientId,clientId);
+        List<TEquipment> list = tEquipmentService.list(query);
+        TEquipment equipment = list.get(0);
+        LambdaQueryWrapper<TPromoCode> query1 = Wrappers.lambdaQuery();
+        query1.eq(TPromoCode::getCode,code);
+        query1.eq(TPromoCode::getAdminId,equipment.getAdminId());
+        List<TPromoCode> list1 = promoCodeService.list(query1);
+        if(list1.size()>0){
+            TPromoCode tPromoCode = list1.get(0);
+            tPromoCode.setIsUse("1");
+            tPromoCode.setUseBy(equipment.getName());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String time = sdf.format(new Date());
+            tPromoCode.setUseDate(time);
+            promoCodeService.updateById(tPromoCode);
+            return R.ok(null,"修改成功");
+        }else {
+            return R.fail(A0002,"没有找到优惠码");
+        }
+    }
     @ApiOperation(value = "修改优惠码")
     @GetMapping("/updatePromoCode")
     public void updatePromoCode(@RequestParam(value = "id")String id, @RequestParam(value = "type")String type) {

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

@@ -45,6 +45,9 @@ public class TProduct implements Serializable {
     @ApiModelProperty(value = "产品名称;")
     private String productName;
 
+    @ApiModelProperty(value = "名称;")
+    private String name;
+
     @ApiModelProperty(value = "人名币价格;")
     private BigDecimal rmbPrice;