Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/service/TUserService.java

@@ -23,4 +23,6 @@ public interface TUserService extends IService<TUser> {
     TUser selectById(String id);
 
     List<TUser> getUserList(TUser user);
+
+    boolean addBox(TUser user);
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TOrganServiceImpl.java

@@ -119,7 +119,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
     public TOrgan selectById(String id) {
         TOrgan organ = organMapper.getById(id);
         String s = areaMapper.selectParent(organ.getAreaId());
-        List<TOrgan> list1 = list(new UpdateWrapper<TOrgan>().eq("parent_id", organ.getId()));
+        List<TOrgan> list1 = list(new UpdateWrapper<TOrgan>().eq("parent_id", organ.getId()).eq("is_deleted",false));
         organ.setAreas(Arrays.asList(s.split(",")));
         organ.setChildren(list1);
         return organ;

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/TUserServiceImpl.java

@@ -3,8 +3,10 @@ package cn.wisenergy.chnmuseum.party.service.impl;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
 import cn.wisenergy.chnmuseum.party.mapper.TAreaMapper;
+import cn.wisenergy.chnmuseum.party.model.TBoxOperation;
 import cn.wisenergy.chnmuseum.party.model.TUser;
 import cn.wisenergy.chnmuseum.party.mapper.TUserMapper;
+import cn.wisenergy.chnmuseum.party.model.TUserRole;
 import cn.wisenergy.chnmuseum.party.service.TUserService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 
@@ -28,6 +31,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@Transactional
 public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements TUserService {
 
     @Resource
@@ -36,6 +40,13 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
     @Resource
     private TAreaMapper areaMapper;
 
+    @Resource
+    TBoxOperationServiceImpl boxOperationService;
+
+
+    @Resource
+    TUserRoleServiceImpl tUserRoleService;
+
     @Override
     public TUser selectByUsername(String userName) {
         return tUserMapper.selectByUsername(userName);
@@ -43,15 +54,15 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
 
     @Override
     public Page<TUser> getList(Page<TUser> page, TUser user) {
-        List<TUser> list = tUserMapper.getList(page,user);
+        List<TUser> list = tUserMapper.getList(page, user);
         for (TUser u : list) {
-            if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus())||AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())){
-                if (AuditOperationEnum.ENABLE.name().equals(u.getStatus())){
+            if (AuditStatusEnum.REFUSED.name().equals(u.getAuditStatus()) || AuditStatusEnum.APPROVED_FINAL.name().equals(u.getAuditStatus())) {
+                if (AuditOperationEnum.ENABLE.name().equals(u.getStatus())) {
                     u.setStatusName("活跃");
-                }else {
+                } else {
                     u.setStatusName("禁用");
                 }
-            }else {
+            } else {
                 u.setStatusName("待审核");
             }
         }
@@ -61,7 +72,7 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
     @Override
     public TUser selectById(String id) {
         TUser user = tUserMapper.getById(id);
-        if (user.getAreaId()!=null) {
+        if (user.getAreaId() != null) {
             String s = areaMapper.selectParent(user.getAreaId());
             user.setAreas(Arrays.asList(s.split(",")));
         }
@@ -74,4 +85,27 @@ public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements
         return list;
     }
 
+    @Override
+    public boolean addBox(TUser user) {
+
+        boolean ret = false;
+        ret = save(user);
+
+        TBoxOperation tBoxOperation = new TBoxOperation();
+        tBoxOperation.setOrganId(user.getOrgId());
+        tBoxOperation.setAreaId(user.getAreaId());
+        tBoxOperation.setStatus(1);
+        tBoxOperation.setCreateTime(LocalDateTime.now());
+        tBoxOperation.setUpdateTime(LocalDateTime.now());
+        ret = boxOperationService.save(tBoxOperation);
+
+        TUserRole userRole = new TUserRole();
+        userRole.setUserId(user.getId());
+        userRole.setRoleId("3");
+        userRole.setIsDeleted(false);
+        ret = tUserRoleService.save(userRole);
+
+        return ret;
+    }
+
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java

@@ -145,14 +145,13 @@ public class ChinaMobileRestApiController extends BaseController {
     @GetMapping("/equitment/activity")
     //@RequiresAuthentication  //@RequiresPermissions("/equitment/activity/")
     public Map<String, Object> getActivity(@RequestParam(required = true) String mac) {
-        List<TBoxOperation> list;
         try {
             UpdateWrapper<TBoxOperation> wrapper = new UpdateWrapper<>();
             wrapper.eq("mac", mac);
-            list = boxOperationService.list(wrapper);
+            TBoxOperation one = boxOperationService.getOne(wrapper);
             HashMap<Object, Object> map = new HashMap<>();
             map.put("activityStatus", false);
-            if (list != null && list.get(0) != null && 2 == list.get(0).getStatus()) {
+            if (one != null) {
                 map.put("activityStatus", true);
             }
             return getResult(map);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -200,15 +200,15 @@ public class ExhibitionBoardController extends BaseController {
         return getFailResult();
     }
 
-    @GetMapping("/getList")
+    @PostMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:list")
     @ApiOperation(value = "获取展板全部列表(无分页)", notes = "获取展板全部列表(无分页)")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
     })
     public Map<String, Object> getExhibitionBoardList(
-            @RequestParam(value = "exhibitionBoardCatIdList", required = false) List<String> exhibitionBoardCatIdList,
-            @RequestParam(value = "boardCopyrightOwnerIdList", required = false) List<String> boardCopyrightOwnerIdList,
+            @RequestParam(value = "exhibitionBoardCatIdList[]", required = false) List<String> exhibitionBoardCatIdList,
+            @RequestParam(value = "boardCopyrightOwnerIdList[]", required = false) List<String> boardCopyrightOwnerIdList,
             @RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
         final LambdaQueryWrapper<ExhibitionBoard> lambdaQueryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getAuditStatus, auditStatus.name()).eq(ExhibitionBoard::getPublished, true);
         lambdaQueryWrapper.eq(ExhibitionBoard::getPublished, true);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java

@@ -405,7 +405,7 @@ public class TUserController extends BaseController {
             entity.setId(userId);
             entity.setUpdateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
             entity.setIsDeleted(true);
-            boolean ret1 = this.userService.updateById(entity);
+            boolean ret1 = this.userService.removeById(entity);
 
             QueryWrapper<TUserRole> userRoleWrapper = new QueryWrapper<>();
             userRoleWrapper.eq("user_id", userId);
@@ -649,7 +649,7 @@ public class TUserController extends BaseController {
                 List<TUser> list = this.userService.list(ew);
                 if (list != null&&list.size()>1&&list.get(0)!=null) {
                     resultMap.put("resultCode", "500");
-                    resultMap.put("message", "每个单位只能有一个机顶盒账号！");
+                    resultMap.put("message", "该单位机顶盒账号已存在！");
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
                 }
             }
@@ -667,21 +667,7 @@ public class TUserController extends BaseController {
             user.setAuditStatus(AuditStatusEnum.APPROVED_FINAL.name());
             user.setType("3");
 
-            boolean ret = this.userService.save(user);
-
-            TBoxOperation tBoxOperation = new TBoxOperation();
-            tBoxOperation.setOrganId(user.getOrgId());
-            tBoxOperation.setAreaId(user.getAreaId());
-            tBoxOperation.setStatus(1);
-            tBoxOperation.setCreateTime(LocalDateTime.now());
-            tBoxOperation.setUpdateTime(LocalDateTime.now());
-            ret = boxOperationService.save(tBoxOperation);
-
-            TUserRole userRole = new TUserRole();
-            userRole.setUserId(user.getId());
-            userRole.setRoleId("3");
-            userRole.setIsDeleted(false);
-            tUserRoleService.save(userRole);
+            boolean ret = this.userService.addBox(user);
 
             if (!ret) {
                 // 新增失败, 500

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -40,7 +40,7 @@ left join t_organ r on r.id = b.organ_id
         from t_user u
         left join t_organ o on o.id = u.org_id
         left join t_area a on u.area_id = a.id
-        left join t_box_operation b on b.organ_id = o.id
+        inner join t_box_operation b on b.organ_id = o.id
         where 1=1
         <if test="user.orgId!= null and user.orgId != '' ">
             and b.organ_id =#{user.orgId}