app、设备、商户、店铺、系统设置代码优化

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/AppController.java

@@ -20,6 +20,9 @@ import javax.validation.constraints.NotBlank;
 import java.util.HashMap;
 import java.util.List;
 
+/**
+ * app管理
+ */
 @RestController
 @RequestMapping("/app")
 public class AppController {
@@ -28,7 +31,7 @@ public class AppController {
 
     /**
      * 添加小程序
-     * @param appVo
+     * @param appVo app信息接收体
      * @return
      */
     @SaCheckPermission("szzs:app:add")
@@ -40,7 +43,7 @@ public class AppController {
 
     /**
      * 删除小程序
-     * @param appKeys
+     * @param appKeys appKey
      * @return
      */
     @SaCheckPermission("szzs:app:delete")
@@ -50,16 +53,21 @@ public class AppController {
         return R.ok();
     }
 
+    /**
+     * 获取商户下的app列表
+     * @param appVo app信息接收体
+     * @return
+     */
     @SaCheckPermission("szzs:app:other")
     @GetMapping("/getAppListByCommercialId")
     public R getAppListByCommercialId(AppVo appVo){
-        PageInfo<App> appListByCommercialId = appService.getAppListByCommercialId(appVo);
+        Page<App> appListByCommercialId = appService.getAppListByCommercialId(appVo);
         return R.ok(appListByCommercialId);
     }
 
     /**
      * 获取小程序详细信息
-     * @param appVo
+     * @param appVo app信息接收体
      * @return
      */
     @SaCheckPermission("szzs:app:query")
@@ -71,7 +79,7 @@ public class AppController {
 
     /**
      * 修改小程序信息
-     * @param appVo
+     * @param appVo app信息接收体
      * @return
      */
     @SaCheckPermission("szzs:app:update")
@@ -81,6 +89,11 @@ public class AppController {
         return r;
     }
 
+    /**
+     * 测试回调地址
+     * @param callBack 回调地址
+     * @return
+     */
     @GetMapping("/testCallBack")
     public R testCallBack(@NotBlank String callBack){
         appService.testCallBack(callBack);
@@ -89,7 +102,7 @@ public class AppController {
 
     /**
      * 获取小程序列表
-     * @param appVo
+     * @param appVo app信息接收体
      * @return
      */
     @SaCheckPermission("szzs:app:list")

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/CommercialController.java

@@ -17,6 +17,9 @@ import javax.validation.constraints.NotEmpty;
 import java.util.HashMap;
 import java.util.List;
 
+/**
+ * 商户管理
+ */
 @RestController
 @RequestMapping("/commercial")
 public class CommercialController {
@@ -25,7 +28,7 @@ public class CommercialController {
 
     /**
      * 新增商户
-     * @param commercialVo
+     * @param commercialVo app信息接收体
      * @return
      */
     @SaCheckPermission("szzs:commerce:add")
@@ -35,6 +38,11 @@ public class CommercialController {
         return R.ok();
     }
 
+    /**
+     * 修改商户信息
+     * @param commercialVo 商户信息接收体
+     * @return
+     */
     @SaCheckPermission("szzs:commerce:update")
     @PutMapping("/updateCommercial")
     public R updateCommercial(@RequestBody @Validated(value = {EditGroup.class}) CommercialVo commercialVo){
@@ -44,7 +52,7 @@ public class CommercialController {
 
     /**
      * 删除商户
-     * @param commercialIds
+     * @param commercialIds 待删除商户Id
      * @return
      */
     @SaCheckPermission("szzs:commerce:delete")
@@ -56,7 +64,7 @@ public class CommercialController {
 
     /**
      * 获取商户详细信息
-     * @param commercialId
+     * @param commercialId 商户Id
      * @return
      */
     @SaCheckPermission("szzs:commerce:query")
@@ -68,7 +76,7 @@ public class CommercialController {
 
     /**
      * 获取商户列表
-     * @param commercialVo
+     * @param commercialVo 商户信息接收体
      * @return
      */
     @SaCheckPermission("szzs:commerce:list")
@@ -78,6 +86,10 @@ public class CommercialController {
         return R.ok(commercialList);
     }
 
+    /**
+     * 获取可选择的商户Id、名称
+     * @return
+     */
     @SaCheckPermission("szzs:commerce:query")
     @GetMapping("/getCommercialName")
     public R getCommercialName(){

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/StoreController.java

@@ -16,6 +16,9 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.util.HashMap;
 
+/**
+ * 店铺管理
+ */
 @RestController
 @RequestMapping("/store")
 public class StoreController {
@@ -24,7 +27,7 @@ public class StoreController {
 
     /**
      * 新增店铺
-     * @param storeVo
+     * @param storeVo 店铺信息接收体
      * @return
      */
     @SaCheckPermission("szzs:store:add")
@@ -36,7 +39,7 @@ public class StoreController {
 
     /**
      * 修改店铺信息
-     * @param storeVo
+     * @param storeVo 店铺信息接收体
      * @return
      */
     @SaCheckPermission("szzs:store:update")
@@ -48,7 +51,7 @@ public class StoreController {
 
     /**
      * 删除店铺
-     * @param storeIds
+     * @param storeIds 待删除的店铺Id
      * @return
      */
     @SaCheckPermission("szzs:store:delete")
@@ -60,7 +63,7 @@ public class StoreController {
 
     /**
      * 获取店铺列表
-     * @param storeVo
+     * @param storeVo 店铺信息接收体
      * @return
      */
     @SaCheckPermission("szzs:store:list")
@@ -70,6 +73,11 @@ public class StoreController {
         return R.ok(storeList);
     }
 
+    /**
+     * 获取店铺详细信息
+     * @param storeId 店铺Id
+     * @return
+     */
     @SaCheckPermission("szzs:store:other")
     @GetMapping("/getStore")
     public R getStore(@NotBlank(message = "店铺Id不能为空") String storeId){

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SystemSetterController.java

@@ -15,13 +15,21 @@ public class SystemSetterController {
     @Autowired
     SystemSetterService systemSetterService;
 
+    /**
+     * 获取广告轮询、曝光系统设置
+     * @return
+     */
     @GetMapping("/getSystemSetter")
     public R getSystemSetter(){
         SystemSetter systemSetter = systemSetterService.getSystemSetter();
-        System.out.println(systemSetter);
         return R.ok(systemSetter);
     }
 
+    /**
+     * 修改广告轮询、曝光系统设置
+     * @param systemSetterVo 广告轮询、曝光系统设置信息接收体
+     * @return
+     */
     @PutMapping("/updateSystemSetter")
     public R updateSystemSetter(@RequestBody @Validated(value = {EditGroup.class}) SystemSetterVo systemSetterVo){
         systemSetterService.updateSystemSetter(systemSetterVo);

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Equipment.java

@@ -66,5 +66,6 @@ public class Equipment {
         this.maintainName = equipmentVo.getMaintainName();
         this.maintainTelephone = equipmentVo.getMaintainTelephone();
         this.annotation = equipmentVo.getAnnotation();
+        this.addrCodeInfo = equipmentVo.getAddrCodeInfo();
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Store.java

@@ -49,6 +49,7 @@ public class Store {
         this.point = storeVo.getPoint();
         this.principalName = storeVo.getPrincipalName();
         this.principalTelephone = storeVo.getPrincipalTelephone();
+        this.addrCodeInfo = storeVo.getAddrCodeInfo();
     }
 
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/AppService.java

@@ -14,7 +14,7 @@ public interface AppService {
 
     void deleteApp(String[] appKeys);
 
-    PageInfo<App> getAppListByCommercialId(AppVo appVo);
+    Page<App> getAppListByCommercialId(AppVo appVo);
 
     App getApp(AppVo appVo);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/AppServiceImpl.java

@@ -43,6 +43,11 @@ public class AppServiceImpl implements AppService {
     @Autowired
     OrderMapper orderMapper;
 
+    /**
+     * 新增app
+     * @param appVo app信息接收体
+     * @return
+     */
     @Override
     public R addApp(AppVo appVo) {
         //判断是否存在该商户
@@ -65,13 +70,22 @@ public class AppServiceImpl implements AppService {
 
     }
 
+    /**
+     * 删除app
+     * @param appKeys appkey
+     */
     @Override
     public void deleteApp(String[] appKeys) {
         appMapper.deleteBatchIds(Arrays.asList(appKeys));
     }
 
+    /**
+     * 根据 商户Id 获取旗下的app
+     * @param appVo app信息接收体
+     * @return
+     */
     @Override
-    public PageInfo<App> getAppListByCommercialId(AppVo appVo) {
+    public Page<App> getAppListByCommercialId(AppVo appVo) {
         QueryWrapper<App> queryWrapper = new QueryWrapper<>();
         if (appVo.getSearchText() != null && !appVo.getSearchText().equals("")){
             queryWrapper.likeRight("appkey",appVo.getSearchText());
@@ -79,18 +93,27 @@ public class AppServiceImpl implements AppService {
             queryWrapper.or().likeRight("commercial_name",appVo.getSearchText());
         }
 
-        PageHelper.startPage(appVo.getPageNum(),appVo.getPageSize());
-        List<App> apps = appMapper.selectList(queryWrapper);
-        PageInfo<App> pageInfo = new PageInfo<>(apps);
-        return pageInfo;
+        Page<App> page = new Page<>(appVo.getPageNum(),appVo.getPageSize());
+        Page<App> page1 = appMapper.selectPage(page, queryWrapper);
+        return page1;
     }
 
+    /**
+     * 根据appKey获取app
+     * @param appVo app信息接收体
+     * @return
+     */
     @Override
     public App getApp(AppVo appVo) {
         App app = appMapper.selectById(appVo.getAppkey());
         return app;
     }
 
+    /**
+     * 修改app相关信息
+     * @param appVo app信息接收体
+     * @return
+     */
     @Override
     public R updateApp(AppVo appVo) {
         //判断是否存在该商户
@@ -146,11 +169,20 @@ public class AppServiceImpl implements AppService {
             return R.fail("不存在该小程序");
     }
 
+    /**
+     * 测试回调地址
+     * @param callBack 回调地址
+     */
     @Override
     public void testCallBack(String callBack) {
         SendCallBackUtil.testCallBack(callBack);
     }
 
+    /**
+     * 获取app列表
+     * @param appVo app信息接收体
+     * @return
+     */
     @Override
     public Page<App> getAppList(AppVo appVo) {
         QueryWrapper<App> queryWrapper = new QueryWrapper<>();
@@ -167,11 +199,15 @@ public class AppServiceImpl implements AppService {
         return appPage;
     }
 
+    /**
+     * 获取可选择的商户列表
+     * @return
+     */
     @Override
     public List<Commercial> getCommercialList() {
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("commercial_id","commercial_name");
-        queryWrapper.eq("state",1);
+        queryWrapper.eq("state",1);  //授权状态：开启
         List<Commercial> commercials = commercialMapper.selectList(queryWrapper);
         return commercials;
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/CommercialServiceImpl.java

@@ -44,6 +44,11 @@ public class CommercialServiceImpl implements CommericalService {
 
     @Autowired
     PlanMapper planMapper;
+
+    /**
+     * 添加商户
+     * @param commercialVo 商户信息接收体
+     */
     @Override
     public void addCommercial(CommercialVo commercialVo) {
         Commercial commercial = new Commercial(commercialVo);
@@ -52,6 +57,11 @@ public class CommercialServiceImpl implements CommericalService {
         commercialMapper.insert(commercial);
     }
 
+    /**
+     * 删除商户
+     * @param commercialIds 待删除商户Id
+     * @return
+     */
     @Override
     public String deleteCommercial(String[] commercialIds) {
         //1.判断旗下是否有小程序
@@ -64,13 +74,24 @@ public class CommercialServiceImpl implements CommericalService {
         return "删除成功";
     }
 
+    /**
+     * 获取商户详细信息
+     * @param commercialId 商户Id
+     * @return
+     */
     @Override
     public Commercial getCommercial(String commercialId) {
         return commercialMapper.selectById(commercialId);
     }
 
+    /**
+     * 获取商户列表
+     * @param commercialVo 商户信息接收体
+     * @return
+     */
     @Override
     public HashMap getCommercialList(CommercialVo commercialVo) {
+        //查找符合条件的商户信息
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         if(commercialVo.getSearchText() != null && !commercialVo.getSearchText().equals("")){
             //queryWrapper.likeRight("commercial_id",commercialVo.getSearchText());
@@ -84,7 +105,7 @@ public class CommercialServiceImpl implements CommericalService {
         page.setSize(commercialVo.getPageSize());
         Page<Commercial> commercialPage = commercialMapper.selectPage(page, queryWrapper);
 
-        //1.找到需要关联的小程序
+        //找到需要关联的小程序
         ArrayList<String> commercialIds = new ArrayList<>();
         List<CommercialBo> result = new ArrayList<>();
         for (Commercial commercial : commercialPage.getRecords()) {
@@ -94,6 +115,7 @@ public class CommercialServiceImpl implements CommericalService {
             result.add(commercialBo);
         }
 
+        //关联
         if (!commercialIds.isEmpty()){
             QueryWrapper<App> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.select("commercial_id","app_name");
@@ -109,6 +131,8 @@ public class CommercialServiceImpl implements CommericalService {
                 commercialBo.setApps(list);
             }
         }
+
+        //返回结果
         commercialPage.setRecords(null);
         HashMap<String, Object> objectObjectHashMap = new HashMap<>();
         objectObjectHashMap.put("page",commercialPage);
@@ -116,6 +140,10 @@ public class CommercialServiceImpl implements CommericalService {
         return objectObjectHashMap;
     }
 
+    /**
+     * 获取商户Id、名称
+     * @return
+     */
     @Override
     public List<Commercial>  getCommercialName() {
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
@@ -124,8 +152,14 @@ public class CommercialServiceImpl implements CommericalService {
         return commercials;
     }
 
+    /**
+     * 修改商户信息
+     * @param commercialVo 商户信息接收体
+     * @return
+     */
     @Override
     public R updateCommercial(CommercialVo commercialVo) {
+        //查找是否存在该商户
         QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("state","commercial_name");
         queryWrapper.eq("commercial_id",commercialVo.getCommercialId());

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -68,6 +68,11 @@ public class EquipmentServiceImpl implements EquipmentService {
     MtStarUtil mtStarUtil;
 
 
+    /**
+     * 添加设备
+     * @param equipmentVo
+     * @return
+     */
     @Override
     public Integer addEquipment(EquipmentVo equipmentVo) {
         //判断是否已经存在设备Code
@@ -78,7 +83,8 @@ public class EquipmentServiceImpl implements EquipmentService {
         if (aLong == 0){
             Equipment equipment = new Equipment(equipmentVo);
             //1.新增地区码映射
-            equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
+            //equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
+
             //2.新增创建时间
             equipment.setEnterTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
 
@@ -94,8 +100,14 @@ public class EquipmentServiceImpl implements EquipmentService {
         return 0;
     }
 
+    /**
+     * 修改设备信息
+     * @param equipmentVo
+     * @return
+     */
     @Override
     public R updateEquipment(EquipmentVo equipmentVo) {
+        //查找是否存在该设备
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("equipment_name","equipment_code","addr_info","addr_code","addr_code_info");
         queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
@@ -121,6 +133,7 @@ public class EquipmentServiceImpl implements EquipmentService {
                 .set("maintain_telephone",equipmentVo.getMaintainTelephone())
                 .set("update_time",equipmentVo.getUpdateTime());
             equipmentMapper.update(null,updateWrapper);
+
             //修改冗余字段
             if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode())){
                 UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
@@ -168,6 +181,11 @@ public class EquipmentServiceImpl implements EquipmentService {
 
     }
 
+    /**
+     * 获取设备详细信息
+     * @param equipmentId
+     * @return
+     */
     @Override
     public EquipmentBo getEquipment(String equipmentId) {
         Equipment equipment = equipmentMapper.selectById(equipmentId);
@@ -175,9 +193,11 @@ public class EquipmentServiceImpl implements EquipmentService {
         return equipmentBo;
     }
 
-    /*
-    * TODO 需要考虑上面有没有广告
-    * */
+    /**
+     * 删除设备（需要考虑设备下有没有广告计划存在）
+     * @param equipmentIds
+     * @return
+     */
     @Override
     public String deleteEquipment(String[] equipmentIds) {
         //1.查询设备下身份有广告
@@ -197,7 +217,11 @@ public class EquipmentServiceImpl implements EquipmentService {
     }
 
 
-
+    /**
+     * 获取没有绑定店铺的设备
+     * @param equipmentVo
+     * @return
+     */
     @Override
     public Page<Equipment> getEquipmentBySelect(EquipmentVo equipmentVo) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
@@ -217,6 +241,10 @@ public class EquipmentServiceImpl implements EquipmentService {
         return pageInfo;
     }
 
+    /**
+     * 绑定设备
+     * @param equipmentVo
+     */
     @Override
     public void addStoreEquipment(EquipmentVo equipmentVo) {
         UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
@@ -225,6 +253,11 @@ public class EquipmentServiceImpl implements EquipmentService {
         equipmentMapper.update(null,updateWrapper);
     }
 
+    /**
+     * 获取店铺下的设备列表
+     * @param equipmentVo
+     * @return
+     */
     @Override
     public Page<Equipment> getEquipmentByStoreId(EquipmentVo equipmentVo) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
@@ -237,7 +270,7 @@ public class EquipmentServiceImpl implements EquipmentService {
     }
 
     /**
-     * TODO 待测试
+     * 获取设备下的计划列表
      * @param equipmentVo
      * @return
      */
@@ -250,16 +283,16 @@ public class EquipmentServiceImpl implements EquipmentService {
         QueryWrapper<PlanItemBo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
         queryWrapper.and(planItemBoQueryWrapper -> {
-            planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
+            planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);  //没有删除
         });
         queryWrapper.and(planItemBoQueryWrapper -> {
-            planItemBoQueryWrapper.eq("dl_plan.state",1);
+            planItemBoQueryWrapper.eq("dl_plan.state",1);  //审核通过
         });
         queryWrapper.and(planItemBoQueryWrapper -> {
-            planItemBoQueryWrapper.eq("dl_plan.on_state",1);
+            planItemBoQueryWrapper.eq("dl_plan.on_state",1);  //上架
         });
         queryWrapper.and(planItemBoQueryWrapper -> {
-            planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));  //结束时间大于当前时间
         });
 
         queryWrapper.apply("dl_plan.`plan_id` = dl_plan_item.`plan_id`");
@@ -275,6 +308,10 @@ public class EquipmentServiceImpl implements EquipmentService {
         return euipmentPlanList;
     }
 
+    /**
+     * 修改设备下的计划排序
+     * @param planItemVo
+     */
     @Override
     public void updateEquipmentPlan(PlanItemVo planItemVo) {
         UpdateWrapper<PlanItem> updateWrapper = new UpdateWrapper<>();
@@ -283,6 +320,10 @@ public class EquipmentServiceImpl implements EquipmentService {
         planItemMapper.update(null,updateWrapper);
     }
 
+    /**
+     * 获取设备数量
+     * @return
+     */
     @Override
     public HashMap getEquipmentCount() {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
@@ -299,6 +340,11 @@ public class EquipmentServiceImpl implements EquipmentService {
         return objectObjectHashMap;
     }
 
+    /**
+     * 获取设备列表
+     * @param equipmentVo
+     * @return
+     */
     @Override
     public HashMap getEquipmentList(EquipmentVo equipmentVo) {
         QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
@@ -366,6 +412,10 @@ public class EquipmentServiceImpl implements EquipmentService {
         return objectObjectHashMap;
     }
 
+    /**
+     * 解除店铺绑定的设备
+     * @param equipmentIds
+     */
     @Override
     public void deleteStoreEquipment(String[] equipmentIds) {
         UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
@@ -374,6 +424,10 @@ public class EquipmentServiceImpl implements EquipmentService {
         equipmentMapper.update(null,updateWrapper);
     }
 
+    /**
+     * 删除设备下的广告推广
+     * @param planItemIds
+     */
     @Override
     public void deleteEquipmentPlan(String[] planItemIds) {
         //删除设备
@@ -387,12 +441,22 @@ public class EquipmentServiceImpl implements EquipmentService {
         }
     }
 
+    /**
+     * 休眠设备
+     * @param equipmentCode
+     * @return
+     */
     @Override
     public String equipmentOnStatedormancy(String equipmentCode) {
         //调用接口
         return mtStarUtil.dormancy(equipmentCode);
     }
 
+    /**
+     * 唤醒设备
+     * @param equipmentCode
+     * @return
+     */
     @Override
     public String equipmentOnStateWakeup(String equipmentCode) {
         return mtStarUtil.wakeup(equipmentCode);

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StoreServiceImpl.java

@@ -37,14 +37,22 @@ public class StoreServiceImpl implements StoreService {
     @Autowired
     InitMapUtil initMapUtil;
 
+    /**
+     * 添加店铺
+     * @param storeVo 店铺信息接收体
+     */
     @Override
     public void addStore(StoreVo storeVo) {
         Store store = new Store(storeVo);
-        store.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(store.getAddrCode()));
+        //store.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(store.getAddrCode()));
         store.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         storeMapper.insert(store);
     }
 
+    /**
+     * 修改店铺信息
+     * @param storeVo 店铺信息接收体
+     */
     @Override
     public void updateStore(StoreVo storeVo) {
         storeVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(storeVo.getAddrCode()));
@@ -62,6 +70,10 @@ public class StoreServiceImpl implements StoreService {
         storeMapper.update(null,updateWrapper);
     }
 
+    /**
+     * 删除店铺
+     * @param storeIds 待删除的店铺Id
+     */
     @Override
     public void deleteStore(String[] storeIds) {
         //1.移除店铺旗下的所有店铺
@@ -74,9 +86,11 @@ public class StoreServiceImpl implements StoreService {
         storeMapper.deleteBatchIds(Arrays.asList(storeIds));
     }
 
-    /*
-    * 店铺管理设备（不支持设备上层没有店铺）
-    * */
+    /**
+     * 获取店铺管理设备（不支持设备上层没有店铺）
+     * @param storeVo 店铺信息接收体
+     * @return
+     */
     @Override
     public HashMap getStoreList(StoreVo storeVo) {
         //1.找到所有店铺列表
@@ -120,6 +134,12 @@ public class StoreServiceImpl implements StoreService {
         return objectObjectHashMap;
     }
 
+    /**
+     * 找到店铺下的设备数量
+     * @param storeId 店铺Id
+     * @param equipments obj(设备所属的店铺Id、数量)
+     * @return
+     */
     private int findEquipmentCount(String storeId,List<Equipment> equipments){
         for (Equipment equipment : equipments) {
             if (equipment.getStoreId().equals(storeId))
@@ -128,6 +148,11 @@ public class StoreServiceImpl implements StoreService {
         return 0;
     }
 
+    /**
+     * 获取店铺详细信息
+     * @param storeId 店铺Id
+     * @return
+     */
     @Override
     public Store getStore(String storeId) {
         Store store = storeMapper.selectById(storeId);

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/SystemSetterServiceImpl.java

@@ -13,12 +13,21 @@ import org.springframework.transaction.annotation.Transactional;
 public class SystemSetterServiceImpl implements SystemSetterService {
     @Autowired
     SystemSetterMapper systemSetterMapper;
+
+    /**
+     * 获取广告轮询、曝光系统设置
+     * @return
+     */
     @Override
     public SystemSetter getSystemSetter() {
         SystemSetter systemSetter = systemSetterMapper.selectOne(null);
         return systemSetter;
     }
 
+    /**
+     * 修改广告轮询、曝光系统设置
+     * @param systemSetterVo 广告轮询、曝光系统设置信息接收体
+     */
     @Override
     public void updateSystemSetter(SystemSetterVo systemSetterVo) {
         SystemSetter systemSetter = new SystemSetter(systemSetterVo);