更新

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

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

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

@@ -36,7 +36,6 @@ import java.util.*;
 @Api(value = "/indexController", tags = {"设备信息上传接口"})
 @RestController
 @RequestMapping("/api/app_equipment/index")
-//@RequestMapping("/indexController")
 public class IndexController { ;
     @Autowired
     TAdminService adminService;

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

@@ -39,6 +39,7 @@ public class TAdController {
     @GetMapping("/pageAd")
     public ResponseModel<IPage<?>> pageAd(long current, long size ) {
         LambdaQueryWrapper<TAd> query = Wrappers.lambdaQuery();
+        query.orderByDesc(TAd::getCreateDate);
         Page<TAd> page = new Page<>(current, size, true);
         IPage<TAd> iPage = adService.page(page, query);
         List<TAd> records = iPage.getRecords();
@@ -57,6 +58,24 @@ public class TAdController {
     @GetMapping("/listAd")
     public ResponseModel<?> listAd() {
         LambdaQueryWrapper<TAd> query = Wrappers.lambdaQuery();
+        query.orderByDesc(TAd::getCreateDate);
+        List<TAd> list = adService.list(query);
+
+        return R.ok(list);
+    }
+    @GetMapping("/getAdList")
+    public ResponseModel<?> getAdList(String type,String userName,String screenType) {
+        LambdaQueryWrapper<TAd> query = Wrappers.lambdaQuery();
+        if(StringUtils.isNotEmpty(type)){
+            query.eq(TAd::getEquipmentType,type);
+        }
+        if(StringUtils.isNotEmpty(userName)){
+            query.eq(TAd::getUsername,userName);
+        }
+        if(StringUtils.isNotEmpty(screenType)){
+            query.eq(TAd::getScreenType,screenType);
+        }
+        query.orderByDesc(TAd::getCreateDate);
         List<TAd> list = adService.list(query);
         return R.ok(list);
     }
@@ -76,6 +95,15 @@ public class TAdController {
         ad.setCreateDate(new Date());
         ad.setModifyDate(new Date());
         adService.save(ad);
+        return R.ok(ad,"添加成功");
+    }
+    @ApiOperation(value = "添加")
+    @GetMapping("/getOne")
+    public ResponseModel<?> getOne(Long id) {
+        if(id==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        TAd ad = adService.getById(id);
         return R.ok(ad);
     }
     @ApiOperation(value = "修改")
@@ -118,8 +146,26 @@ public class TAdController {
         oldAd.setTimeRule(ad.getTimeRule());
         oldAd.setType(ad.getType());
         adService.updateById(oldAd);
-        return R.ok();
+        return R.ok(oldAd,"修改成功");
+    }
+    /**
+     *
+     *
+     * @param
+     * @return
+     */
+    @GetMapping(value = "/deletes")
+    @ResponseBody
+    public ResponseModel<?> deletes(int[] ids) {
+        if(ids==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        if(ids.length>0){
+            for(int i=0;i<ids.length;i++){
+                adService.removeById(ids[i]);
+            }
+        }
+        return  R.ok(null,"删除成功");
     }
-
 }
 

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

@@ -16,6 +16,7 @@ import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.dto.PromoCodeTarget;
 import com.szwl.model.entity.*;
+import com.szwl.model.utils.DateUtils;
 import com.szwl.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,6 +40,7 @@ import java.util.*;
 
 import static com.szwl.constant.ResponseCodesEnum.A0001;
 import static com.szwl.constant.ResponseCodesEnum.A0002;
+import static com.szwl.model.utils.DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss;
 
 /**
  * <p>
@@ -86,12 +88,29 @@ public class TPromoCodeController {
     }
     @ApiOperation(value = "小程序获取优惠码")
     @GetMapping("/getCode")
-    public ResponseModel<TPromoCode> getCode( String  code) {
-        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getCode,code);
-        List<TPromoCode> list = promoCodeService.list(query);
-        if(list.size()>0){
-            TPromoCode tPromoCode = list.get(0);
+    public ResponseModel<TPromoCode> getCode(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);
+            String isUse = tPromoCode.getIsUse();
+            if(isUse.equals("1")){
+                return R.fail(A0002,"已使用");
+            }
+            Date lastUseDate = tPromoCode.getLastUseDate();
+            Date date = new Date();
+            if(date.getTime()>lastUseDate.getTime()){
+                return R.fail(A0002,"已过期");
+            }
             return R.ok(tPromoCode);
         }else {
             return R.fail(A0002,"没有找到优惠码");
@@ -102,6 +121,9 @@ public class TPromoCodeController {
     public void updatePromoCode(@RequestParam(value = "id")String id, @RequestParam(value = "type")String type) {
         TPromoCode promoCode = promoCodeService.getById(id);
         promoCode.setIsUse(type);
+        if(type.equals("1")){
+            promoCode.setUseDate(DateUtils.formatDate(new Date(),PATTERN_yyyy_MM_dd_HH_mm_ss));
+        }
         promoCodeService.updateById(promoCode);
     }
     @ApiOperation(value = "生成0折优惠码")

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

@@ -56,8 +56,24 @@ public class TProportionController {
                 query.eq(TProportionCheck::getAdminId,admin.getId());
                 query.in(TProportionCheck::getCheckType,"0","2","3");
             }
+            query.orderByDesc(TProportionCheck::getCreateDate);
             Page<TProportionCheck> page = new Page<>(current, size, true);
             IPage<TProportionCheck> iPage = tProportionCheckService.page(page, query);
+            List<TProportionCheck> records = iPage.getRecords();
+            if(records.size()>0){
+                for(TProportionCheck proportionCheck:records){
+                    if(proportionCheck.getEquipmentId()!=null){
+                        TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
+                        if(StringUtils.isNotEmpty(equipment.getName())){
+                            proportionCheck.setEquipmentName(equipment.getName());
+                        }else {
+                            proportionCheck.setEquipmentName(equipment.getClientId());
+                        }
+                    }
+
+                }
+            }
+
             return R.ok(iPage);
         }else {
             //已审核
@@ -65,8 +81,22 @@ public class TProportionController {
             if(admin.getType()>1){
                 query.eq(TProportion::getAdminId,admin.getId());
             }
+            query.orderByDesc(TProportion::getCreateDate);
             Page<TProportion> page = new Page<>(current, size, true);
             IPage<TProportion> iPage = tProportionService.page(page, query);
+            List<TProportion> records = iPage.getRecords();
+            if(records.size()>0){
+                for(TProportion proportion:records){
+                    if(proportion.getEquipmentId()!=null){
+                        TEquipment equipment = tEquipmentService.getById(proportion.getEquipmentId());
+                        if(StringUtils.isNotEmpty(equipment.getName())){
+                            proportion.setEquipmentName(equipment.getName());
+                        }else {
+                            proportion.setEquipmentName(equipment.getClientId());
+                        }
+                    }
+                }
+            }
             return R.ok(iPage);
         }
     }

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

@@ -52,6 +52,7 @@ public class TTimeRuleController {
     @GetMapping("/pageTimeRule")
     public ResponseModel<IPage<?>> pageTimeRule(long current, long size ) {
         LambdaQueryWrapper<TTimeRule> query = Wrappers.lambdaQuery();
+        query.orderByDesc(TTimeRule::getCreateDate);
         Page<TTimeRule> page = new Page<>(current, size, true);
         IPage<TTimeRule> iPage = timeRuleService.page(page, query);
         return R.ok(iPage);
@@ -65,7 +66,7 @@ public class TTimeRuleController {
         timeRule.setCreateDate(new Date());
         timeRule.setModifyDate(new Date());
         timeRuleService.save(timeRule);
-        return R.ok(timeRule);
+        return R.ok(timeRule,"添加成功");
     }
     @ApiOperation(value = "修改")
     @PostMapping("/update")
@@ -73,11 +74,47 @@ public class TTimeRuleController {
         if(StringUtils.isEmpty(timeRule.getName())&&StringUtils.isEmpty(timeRule.getRule())){
             return R.fail(ResponseCodesEnum.A0001);
         }
-        timeRule.setModifyDate(new Date());
-        timeRuleService.updateById(timeRule);
-        return R.ok(timeRule);
+        TTimeRule oldTimeRule = timeRuleService.getById(timeRule.getId());
+        oldTimeRule.setName(timeRule.getName());
+        oldTimeRule.setRule(timeRule.getRule());
+        oldTimeRule.setModifyDate(new Date());
+        timeRuleService.updateById(oldTimeRule);
+        return R.ok(oldTimeRule,"修改成功");
+    }
+    /**
+     * 获取时间规则
+     *
+     * @param id 规则id
+     * @return
+     */
+    @GetMapping(value = "/getOne")
+    @ResponseBody
+    public ResponseModel<?> getOne(Long id) {
+        if(id==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        TTimeRule timeRule = timeRuleService.getById(id);
+        return  R.ok(timeRule);
+    }
+    /**
+     * 删除时间规则
+     *
+     * @param
+     * @return
+     */
+    @GetMapping(value = "/deletes")
+    @ResponseBody
+    public ResponseModel<?> deletes(int[] ids) {
+        if(ids==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        if(ids.length>0){
+            for(int i=0;i<ids.length;i++){
+                timeRuleService.removeById(ids[i]);
+            }
+        }
+        return  R.ok(null,"删除成功");
     }
-
     /**
      * 推送时间规则广告id
      *
@@ -95,7 +132,7 @@ public class TTimeRuleController {
             equipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("pushTimeRule", id + "").toString());
 //            PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("pushTimeRule", id + "").toString());
         }
-        return  R.ok();
+        return  R.ok(null,"推送成功");
     }
 }
 

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

@@ -67,6 +67,8 @@ public class TProportion implements Serializable {
 
     private String agencyName;
 
+    private String equipmentName;
+
     private String merchantName;
 
     private String personageName;

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

@@ -36,6 +36,8 @@ public class TProportionCheck implements Serializable {
 
     private Long equipmentId;
 
+    private String equipmentName;
+
     private String clientId;
 
     private BigDecimal adminProportion;

src/main/resources/bootstrap.yml

@@ -14,6 +14,8 @@ spring:
 # 项目端口
 server:
   port: 49011
+  maxPostSize: -1
+  maxHttpHeaderSize: 1024000
 
 management:
   endpoints: