init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTeamController.java

@@ -62,13 +62,9 @@ import java.util.stream.Collectors;
 public class WmTeamController {
 
 	private final WmTeamService wmTeamService;
-
 	private final WmScorePackageService wmScorePackageService;
-
 	private final WmScorePackageStatusService wmScorePackageStatusService;
-
 	private final SysUserMapper sysUserMapper;
-
 	private final SysDictItemService sysDictItemService;
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmUserSignController.java

@@ -1,6 +1,5 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -15,79 +14,79 @@ import org.springframework.web.bind.annotation.*;
 /**
  * 用户签到表
  *
- * @author pigx code generator
+ * @author gaoyang
  * @date 2020-07-14 20:10:02
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/wmusersign" )
+@RequestMapping("/wmusersign")
 public class WmUserSignController {
 
-    private final  WmUserSignService wmUserSignService;
+    private final WmUserSignService wmUserSignService;
 
     /**
      * 分页查询
-     * @param page 分页对象
+     *
+     * @param page       分页对象
      * @param wmUserSign 用户签到表
-     * @return
+     * @return 分页结果
      */
-    @GetMapping("/page" )
-    @PreAuthorize("@pms.hasPermission('admin_wmusersign_view')" )
-    public R getWmUserSignPage(Page page, WmUserSign wmUserSign) {
+    @GetMapping("/page")
+    @PreAuthorize("@pms.hasPermission('admin_wmusersign_view')")
+    public R<?> getWmUserSignPage(Page<WmUserSign> page, WmUserSign wmUserSign) {
 
-		OrderItem orderItem=new OrderItem();
-		orderItem.setColumn("create_time");
-		orderItem.setAsc(false);
-		page.addOrder(orderItem);
-
-        return R.ok(wmUserSignService.page(page, Wrappers.query(wmUserSign)));
+        return R.ok(wmUserSignService.page(page, Wrappers.query(wmUserSign).orderByDesc("create_time")));
     }
 
 
     /**
      * 通过id查询用户签到表
+     *
      * @param id id
      * @return R
      */
-    @GetMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('admin_wmusersign_view')" )
-    public R getById(@PathVariable("id" ) Integer id) {
+    @GetMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('admin_wmusersign_view')")
+    public R<?> getById(@PathVariable("id") Integer id) {
         return R.ok(wmUserSignService.getById(id));
     }
 
     /**
      * 新增用户签到表
+     *
      * @param wmUserSign 用户签到表
      * @return R
      */
-    @SysLog("新增用户签到表" )
+    @SysLog("新增用户签到表")
     @PostMapping
-    @PreAuthorize("@pms.hasPermission('admin_wmusersign_add')" )
-    public R save(@RequestBody WmUserSign wmUserSign) {
-    	return R.ok(wmUserSignService.save(wmUserSign));
+    @PreAuthorize("@pms.hasPermission('admin_wmusersign_add')")
+    public R<?> save(@RequestBody WmUserSign wmUserSign) {
+        return R.ok(wmUserSignService.save(wmUserSign));
     }
 
     /**
      * 修改用户签到表
+     *
      * @param wmUserSign 用户签到表
      * @return R
      */
-    @SysLog("修改用户签到表" )
+    @SysLog("修改用户签到表")
     @PutMapping
-    @PreAuthorize("@pms.hasPermission('admin_wmusersign_edit')" )
-    public R updateById(@RequestBody WmUserSign wmUserSign) {
+    @PreAuthorize("@pms.hasPermission('admin_wmusersign_edit')")
+    public R<?> updateById(@RequestBody WmUserSign wmUserSign) {
         return R.ok(wmUserSignService.updateById(wmUserSign));
     }
 
     /**
      * 通过id删除用户签到表
+     *
      * @param id id
      * @return R
      */
-    @SysLog("通过id删除用户签到表" )
-    @DeleteMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('admin_wmusersign_del')" )
-    public R removeById(@PathVariable Integer id) {
+    @SysLog("通过id删除用户签到表")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('admin_wmusersign_del')")
+    public R<?> removeById(@PathVariable Integer id) {
         return R.ok(wmUserSignService.removeById(id));
     }
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmWkAlbumController.java

@@ -1,5 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -35,138 +37,133 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/wmwkalbum" )
+@RequestMapping("/wmwkalbum")
 public class WmWkAlbumController {
 
-    private final  WmWkAlbumService wmWkAlbumService;
-	private final WmDaDrugEntDrugtableService wmDaDrugEntDrugtableService;
-	private final SysCsmUserRelationService sysCsmUserRelationService;
+    private final WmWkAlbumService wmWkAlbumService;
+    private final WmDaDrugEntDrugtableService wmDaDrugEntDrugtableService;
+    private final SysCsmUserRelationService sysCsmUserRelationService;
 
     /**
      * 分页查询
-     * @param page 分页对象
+     *
+     * @param page      分页对象
      * @param wmWkAlbum 文库-相册
-     * @return
+     * @return 分页结果
      */
-    @GetMapping("/page" )
-    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_view')" )
+    @GetMapping("/page")
+    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_view')")
     public R<IPage<WmWkAlbum>> getWmWkAlbumPage(Page<WmWkAlbum> page, WmWkAlbum wmWkAlbum) {
-		OrderItem orderItem=new OrderItem();
-		orderItem.setColumn("create_time");
-		orderItem.setAsc(false);
-		page.addOrder(orderItem);
-
-		QueryWrapper<WmWkAlbum> queryWrapper=Wrappers.query();
-		if(null!=wmWkAlbum.getXcmc())
-		{
-			queryWrapper.like(true,"xcmc",wmWkAlbum.getXcmc());
-		}
-
-		if(null!=wmWkAlbum.getGlyp())
-		{
-			queryWrapper.apply(true,"FIND_IN_SET ("+wmWkAlbum.getGlyp()+",glyp)");
-		}
-
-		queryWrapper.eq("del_flag", DelEnum.NOT_DEL.val());
-		queryWrapper.orderByDesc("create_time");
-
-		if (SecurityUtils.getRoles().contains(19)) {
-			// CSM只能查看自己维护的企业下的数据, 以及下属维护的企业下的数据
-			Integer userId = SecurityUtils.getUser().getId();
-			// 递归查询下属关联的userId
-			Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
-			queryWrapper.and(wrapper -> {
-				wrapper.in("create_user", allUserIds)
-						.or(wrapper2 -> wrapper2.isNull("create_user"));
-			});
-		}
-
-    	Page<WmWkAlbum> pageAnswer = wmWkAlbumService.page(page, queryWrapper);
-    	List<WmWkAlbum> wmWkAlbumList = pageAnswer.getRecords();
-    	if(null!=wmWkAlbumList)
-		{
-			for (WmWkAlbum wmW :wmWkAlbumList) {
-				if(null!=wmW.getGlyp())
-				{
-//					if(wmW.getGlyp().contains(","))
-//					{
-						String [] ar=wmW.getGlyp().split(",");
-						List<String> list=new ArrayList<>(Arrays.asList(ar));
-						List<WmDaDrugEntDrugtable>  wmDaDrugEntDrugtableList=wmDaDrugEntDrugtableService.listByIds(list);
-						if(wmDaDrugEntDrugtableList.size()>0)
-						{
-							String temp1="";
-							for (int i=0;i<wmDaDrugEntDrugtableList.size();i++) {
-								temp1+=wmDaDrugEntDrugtableList.get(i).getDrugname();
-								if(i<wmDaDrugEntDrugtableList.size()-1)
-								{
-									temp1+=",";
-								}
-							}
-							wmW.setTemp1(temp1);
-						}
-
-//					}
-				}
-			}
-		}
-		pageAnswer.setRecords(wmWkAlbumList);
+        OrderItem orderItem = new OrderItem();
+        orderItem.setColumn("create_time");
+        orderItem.setAsc(false);
+        page.addOrder(orderItem);
+
+        QueryWrapper<WmWkAlbum> queryWrapper = Wrappers.query();
+        if (null != wmWkAlbum.getXcmc()) {
+            queryWrapper.like(true, "xcmc", wmWkAlbum.getXcmc());
+        }
+
+        if (null != wmWkAlbum.getGlyp()) {
+            queryWrapper.apply(true, "FIND_IN_SET (" + wmWkAlbum.getGlyp() + ",glyp)");
+        }
+
+        queryWrapper.eq("del_flag", DelEnum.NOT_DEL.val());
+        queryWrapper.orderByDesc("create_time");
+
+        if (SecurityUtils.getRoles().contains(19)) {
+            // CSM只能查看自己维护的企业下的数据, 以及下属维护的企业下的数据
+            Integer userId = SecurityUtils.getUser().getId();
+            // 递归查询下属关联的userId
+            Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
+            queryWrapper.and(wrapper -> {
+                wrapper.in("create_user", allUserIds)
+                        .or(wrapper2 -> wrapper2.isNull("create_user"));
+            });
+        }
+
+        Page<WmWkAlbum> pageAnswer = wmWkAlbumService.page(page, queryWrapper);
+        List<WmWkAlbum> wmWkAlbumList = pageAnswer.getRecords();
+        if (null != wmWkAlbumList) {
+            for (WmWkAlbum wmW : wmWkAlbumList) {
+                if (null != wmW.getGlyp()) {
+                    String[] ar = wmW.getGlyp().split(StrUtil.COMMA);
+                    List<String> list = new ArrayList<>(Arrays.asList(ar));
+                    List<WmDaDrugEntDrugtable> wmDaDrugEntDrugtableList = wmDaDrugEntDrugtableService.listByIds(list);
+                    if (CollUtil.isNotEmpty(wmDaDrugEntDrugtableList)) {
+                        StringBuilder temp1 = new StringBuilder();
+                        for (int i = 0; i < wmDaDrugEntDrugtableList.size(); i++) {
+                            temp1.append(wmDaDrugEntDrugtableList.get(i).getDrugname());
+                            if (i < wmDaDrugEntDrugtableList.size() - 1) {
+                                temp1.append(",");
+                            }
+                        }
+                        wmW.setTemp1(temp1.toString());
+                    }
+
+                }
+            }
+        }
+        pageAnswer.setRecords(wmWkAlbumList);
         return R.ok(pageAnswer);
     }
 
 
     /**
      * 通过id查询文库-相册
+     *
      * @param id id
      * @return R
      */
-    @GetMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_view')" )
-    public R getById(@PathVariable("id" ) Integer id) {
+    @GetMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_view')")
+    public R<?> getById(@PathVariable("id") Integer id) {
         return R.ok(wmWkAlbumService.getById(id));
     }
 
     /**
      * 新增文库-相册
+     *
      * @param wmWkAlbum 文库-相册
      * @return R
      */
-    @SysLog("新增文库-相册" )
+    @SysLog("新增文库-相册")
     @PostMapping
-    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_add')" )
-    public R save(@RequestBody WmWkAlbum wmWkAlbum) {
-		wmWkAlbum.setForwardNum(0);
-		wmWkAlbum.setCreateTime(LocalDateTime.now());
-		wmWkAlbum.setCreateUser(SecurityUtils.getUser().getId());
-//        return R.ok(wmWkAlbumService.save(wmWkAlbum));
-		wmWkAlbumService.saveWmWkAlbum(wmWkAlbum);
+    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_add')")
+    public R<?> save(@RequestBody WmWkAlbum wmWkAlbum) {
+        wmWkAlbum.setForwardNum(0);
+        wmWkAlbum.setCreateTime(LocalDateTime.now());
+        wmWkAlbum.setCreateUser(SecurityUtils.getUser().getId());
+        wmWkAlbumService.saveWmWkAlbum(wmWkAlbum);
         return R.ok();
     }
 
     /**
      * 修改文库-相册
+     *
      * @param wmWkAlbum 文库-相册
      * @return R
      */
-    @SysLog("修改文库-相册" )
+    @SysLog("修改文库-相册")
     @PutMapping
-    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_edit')" )
-    public R updateById(@RequestBody WmWkAlbum wmWkAlbum) {
-		wmWkAlbum.setUpdateTime(LocalDateTime.now());
-		wmWkAlbum.setUpdateUser(SecurityUtils.getUser().getId());
-		wmWkAlbumService.updateWmWkAlbumById(wmWkAlbum);
+    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_edit')")
+    public R<?> updateById(@RequestBody WmWkAlbum wmWkAlbum) {
+        wmWkAlbum.setUpdateTime(LocalDateTime.now());
+        wmWkAlbum.setUpdateUser(SecurityUtils.getUser().getId());
+        wmWkAlbumService.updateWmWkAlbumById(wmWkAlbum);
         return R.ok();
     }
 
     /**
      * 通过id删除文库-相册
+     *
      * @param id id
      * @return R
      */
-    @SysLog("通过id删除文库-相册" )
-    @DeleteMapping("/{id}" )
-    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_del')" )
-    public R removeById(@PathVariable Integer id) {
+    @SysLog("通过id删除文库-相册")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('admin_wmwkalbum_del')")
+    public R<?> removeById(@PathVariable Integer id) {
         return R.ok(wmWkAlbumService.removeById(id));
     }