Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/common/utils/WeChatUtil.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.common.utils;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.hutool.http.HttpUtil;
@@ -11,6 +12,7 @@ import com.xjrsoft.module.organization.dto.WeChatDepartDto;
 import com.xjrsoft.module.organization.dto.WeChatUserDto;
 import com.xjrsoft.module.system.vo.WeChatUserInfo;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -24,6 +26,7 @@ import java.util.UUID;
 
 @Component
 @Data
+@Slf4j
 public class WeChatUtil {
     @Value("${xjrsoft.enterpriseWeChat.corpid}")
     public String appKey;
@@ -144,6 +147,7 @@ public class WeChatUtil {
 
     //公众号发送文本消息给用户
     public Boolean sendMessage(String content, String userId) {
+
         String token = this.getToken(WeChatType.WEWEB);
         JSONObject object = new JSONObject();
         JSONArray touser=new JSONArray();
@@ -180,6 +184,11 @@ public class WeChatUtil {
     //           }
     //       }
     public Boolean sendTemplateMessage(JSONObject object){
+        String active = SpringUtil.getActiveProfile();
+        if(!"prod".equals(active)){
+            log.info("非正式环境，无法执行数据推送");
+            return false;
+        }
         String token = this.getToken(WeChatType.WEWEB);
         String result = HttpUtil.post("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+token, JSONObject.toJSONString(object));
         System.out.printf(result);

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -1,35 +1,39 @@
 package com.xjrsoft.module.asset.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xjrsoft.common.constant.GlobalConstant;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.asset.dto.AddWfAssetManageDto;
 import com.xjrsoft.module.asset.dto.UpdateWfAssetManageDto;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-
 import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
 import com.xjrsoft.module.asset.entity.WfAssetManage;
 import com.xjrsoft.module.asset.service.IWfAssetManageService;
+import com.xjrsoft.module.asset.vo.BaseOfficeBuildVo;
+import com.xjrsoft.module.asset.vo.PlaceTreeVo;
 import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
-
 import com.xjrsoft.module.asset.vo.WfAssetManageVo;
+import com.xjrsoft.module.base.entity.BaseClassroom;
+import com.xjrsoft.module.base.entity.BaseOfficeBuild;
+import com.xjrsoft.module.base.service.IBaseClassroomService;
+import com.xjrsoft.module.base.service.IBaseOfficeBuildService;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 * @title: 资产管理
@@ -46,16 +50,113 @@ public class WfAssetManageController {
 
     private final IWfAssetManageService wfAssetManageService;
 
+    private final IBaseOfficeBuildService baseOfficeBuildService;
+
+    private final IBaseClassroomService baseClassroomService;
+
+    @GetMapping(value = "/buildingfloorclassroomtree")
+    @ApiOperation(value = "楼栋楼层教室树")
+    @SaCheckPermission("studentmanager:detail")
+    public RT<List<PlaceTreeVo>> buildingFloorClassroomTree() {
+        List<PlaceTreeVo> voList = new ArrayList<>();
+        long customUniqueId = 101010;
+
+        //获取楼栋信息记录
+        MPJLambdaWrapper<BaseOfficeBuild> baseOfficeBuildMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        baseOfficeBuildMPJLambdaWrapper
+                .select(BaseOfficeBuild::getId)
+                .selectAs(DictionaryDetail::getName, BaseOfficeBuildVo::getBuildTypeCn)
+                .select(BaseOfficeBuild.class,x -> VoToColumnUtil.fieldsToColumns(BaseOfficeBuildVo.class).contains(x.getProperty()))
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseOfficeBuild::getBuildType)
+        ;
+
+        List<BaseOfficeBuildVo> baseOfficeBuildVoList = baseOfficeBuildService.selectJoinList(BaseOfficeBuildVo.class, baseOfficeBuildMPJLambdaWrapper);
+
+        Map<String, List<BaseOfficeBuildVo>> officeBuildByAddress = baseOfficeBuildVoList.stream().collect(Collectors.groupingBy(BaseOfficeBuildVo::getAddress));
+
+        for (Map.Entry<String, List<BaseOfficeBuildVo>> entry : officeBuildByAddress.entrySet()){
+            String key = entry.getKey();
+            List<BaseOfficeBuildVo> value = entry.getValue();
+
+            voList.add(new PlaceTreeVo(){{
+                setId(8888L);
+                setName(key);
+            }});
+
+            if(!value.isEmpty()){
+                Map<String, List<BaseOfficeBuildVo>> officeBuildByType = value.stream().collect(Collectors.groupingBy(BaseOfficeBuildVo::getBuildType));
+                for (Map.Entry<String, List<BaseOfficeBuildVo>> e : officeBuildByType.entrySet()){
+                    String k = e.getKey();
+                    List<BaseOfficeBuildVo> v = e.getValue();
+
+                    PlaceTreeVo placeTreeVo = new PlaceTreeVo();
+                    placeTreeVo.setId(customUniqueId);
+                    if(!v.isEmpty() && v.get(0) != null){
+                        placeTreeVo.setName(v.get(0).getBuildTypeCn());
+                    }
+                    placeTreeVo.setParentId(8888L);
+                    voList.add(placeTreeVo);
+
+                    if(!v.isEmpty()){
+                        for (BaseOfficeBuildVo baseOfficeBuildVo : v){
+                            PlaceTreeVo p = new PlaceTreeVo();
+                            p.setId(baseOfficeBuildVo.getId());
+                            p.setName(baseOfficeBuildVo.getName());
+                            p.setParentId(customUniqueId);
+                            voList.add(p);
+                        }
+                    }
+
+                    customUniqueId++;
+                }
+            }
+        }
+
+        //获取教室信息
+        List<BaseClassroom> baseClassroomList = baseClassroomService.list();
+
+        Map<Long, List<BaseClassroom>> baseClassroomMap = baseClassroomList.stream().collect(Collectors.groupingBy(BaseClassroom::getOfficeBuildId));
+        for (Map.Entry<Long, List<BaseClassroom>> entry : baseClassroomMap.entrySet()){
+            Long key = entry.getKey();
+            List<BaseClassroom> value = entry.getValue();
+
+            if(!value.isEmpty()){
+                Map<Integer, List<BaseClassroom>> baseClassroomByFloorNum = value.stream().collect(Collectors.groupingBy(BaseClassroom::getFloorNum));
+                for (Map.Entry<Integer, List<BaseClassroom>> e : baseClassroomByFloorNum.entrySet()){
+                    Integer k = e.getKey();
+                    List<BaseClassroom> v = e.getValue();
+
+                    PlaceTreeVo placeTreeVo = new PlaceTreeVo();
+                    placeTreeVo.setId(customUniqueId);
+                    placeTreeVo.setName(k + "楼");
+                    placeTreeVo.setParentId(key);
+                    voList.add(placeTreeVo);
+
+                    if(!v.isEmpty()){
+                        for (BaseClassroom baseClassroom : v){
+                            PlaceTreeVo p = new PlaceTreeVo();
+                            p.setId(baseClassroom.getId());
+                            p.setName(baseClassroom.getName());
+                            p.setParentId(customUniqueId);
+                            voList.add(p);
+                        }
+                    }
+
+                    customUniqueId++;
+                }
+            }
+        }
+
+        List<PlaceTreeVo> treeVoList = TreeUtil.build(voList);
+
+        return RT.ok(treeVoList);
+    }
+
     @GetMapping(value = "/page")
     @ApiOperation(value="资产管理列表(分页)")
     @SaCheckPermission("wfassetmanage:detail")
     public RT<PageOutput<WfAssetManagePageVo>> page(@Valid WfAssetManagePageDto dto){
-
-        LambdaQueryWrapper<WfAssetManage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper
-                    .orderByDesc(WfAssetManage::getId)
-                .select(WfAssetManage.class,x -> VoToColumnUtil.fieldsToColumns(WfAssetManagePageVo.class).contains(x.getProperty()));
-        IPage<WfAssetManage> page = wfAssetManageService.page(ConventPage.getPage(dto), queryWrapper);
+        IPage<WfAssetManagePageVo> page = wfAssetManageService.getPage(dto);
         PageOutput<WfAssetManagePageVo> pageOutput = ConventPage.getPageOutput(page, WfAssetManagePageVo.class);
         return RT.ok(pageOutput);
     }

src/main/java/com/xjrsoft/module/asset/dto/WfAssetManagePageDto.java

@@ -21,6 +21,35 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class WfAssetManagePageDto extends PageInput {
-
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("资产类型")
+    private String assetType;
+    /**
+     * 资产类别
+     */
+    @ApiModelProperty("资产类别")
+    private String assetCategory;
+    /**
+     * 资产种类
+     */
+    @ApiModelProperty("资产种类")
+    private String assetSpecies;
+    /**
+     * 名称
+     */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+     * 所属部门[xjr_department]
+     */
+    @ApiModelProperty("所属部门[xjr_department]")
+    private Long deptId;
+    /**
+     * 使用人id[xjr_user]
+     */
+    @ApiModelProperty("使用人id[xjr_user]")
+    private Long userId;
 
 }

src/main/java/com/xjrsoft/module/asset/mapper/WfAssetManageMapper.java

@@ -1,8 +1,14 @@
 package com.xjrsoft.module.asset.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
 import com.xjrsoft.module.asset.entity.WfAssetManage;
+import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
+import com.xjrsoft.module.textbook.dto.TextbookPageDto;
+import com.xjrsoft.module.textbook.vo.TextbookPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -14,4 +20,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface WfAssetManageMapper extends MPJBaseMapper<WfAssetManage> {
 
+    IPage<WfAssetManagePageVo> getPage(Page<TextbookPageDto> page, WfAssetManagePageDto dto);
+    Page<TextbookPageVo> getPage(Page<TextbookPageDto> page, TextbookPageDto dto);
 }

src/main/java/com/xjrsoft/module/asset/service/IWfAssetManageService.java

@@ -1,8 +1,11 @@
 package com.xjrsoft.module.asset.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
 import com.xjrsoft.module.asset.entity.WfAssetManage;
+import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
 import lombok.Data;
 import java.util.List;
 
@@ -14,4 +17,5 @@ import java.util.List;
 */
 
 public interface IWfAssetManageService extends MPJBaseService<WfAssetManage> {
+    IPage<WfAssetManagePageVo> getPage(WfAssetManagePageDto dto);
 }

src/main/java/com/xjrsoft/module/asset/service/impl/WfAssetManageServiceImpl.java

@@ -1,10 +1,17 @@
 package com.xjrsoft.module.asset.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.asset.dto.WfAssetManagePageDto;
 import com.xjrsoft.module.asset.entity.WfAssetManage;
 import com.xjrsoft.module.asset.mapper.WfAssetManageMapper;
 import com.xjrsoft.module.asset.service.IWfAssetManageService;
+import com.xjrsoft.module.asset.vo.WfAssetManagePageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,4 +29,18 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class WfAssetManageServiceImpl extends MPJBaseServiceImpl<WfAssetManageMapper, WfAssetManage> implements IWfAssetManageService {
+
+    private final WfAssetManageMapper wfAssetManageMapper;
+    @Override
+    public IPage<WfAssetManagePageVo> getPage(WfAssetManagePageDto dto) {
+        /*MPJLambdaWrapper<WfAssetManage> wfAssetManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        wfAssetManageMPJLambdaWrapper
+
+                .select(WfAssetManage.class,x -> VoToColumnUtil.fieldsToColumns(WfAssetManagePageVo.class).contains(x.getProperty()))
+
+                .orderByDesc(WfAssetManage::getId)
+        ;
+        this.selectJoinListPage(ConventPage.getPage(dto))*/
+        return null;
+    }
 }

src/main/java/com/xjrsoft/module/asset/vo/BaseOfficeBuildVo.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.asset.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseOfficeBuildVo {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("楼栋名称")
+    private String name;
+
+    @ApiModelProperty("所属校区(xjr_department)第一级")
+    private Long orgId;
+
+    @ApiModelProperty("楼层数")
+    private Integer floorTotal;
+
+    @ApiModelProperty("楼栋类型(xjr_dictionary_item[build_type])")
+    private String buildType;
+
+    @ApiModelProperty("楼栋号")
+    private Integer buildNumber;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("楼栋类型")
+    private String buildTypeCn;
+}

src/main/java/com/xjrsoft/module/asset/vo/PlaceTreeVo.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.asset.vo;
+
+import com.xjrsoft.common.model.tree.ITreeNode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author szs
+ * @date 2024/3/25
+ */
+@Data
+public class PlaceTreeVo implements ITreeNode<PlaceTreeVo, Long>, Serializable {
+    @ApiModelProperty("id")
+    private Long id;
+
+
+    @ApiModelProperty("name")
+    private String name;
+
+
+    @ApiModelProperty("disabled")
+    private Long parentId;
+
+
+    @ApiModelProperty("children")
+    private List<PlaceTreeVo> children;
+
+}

src/main/java/com/xjrsoft/module/asset/vo/WfAssetManagePageVo.java

@@ -20,56 +20,36 @@ import java.util.Date;
 @Data
 public class WfAssetManagePageVo {
 
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private String id;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Long createUserId;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Date createDate;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Long modifyUserId;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Date modifyDate;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Integer deleteMark;
-    /**
-    * 
-    */
-    @ApiModelProperty("")
-    private Integer enabledMark;
     /**
     * 资产类型
     */
     @ApiModelProperty("资产类型")
     private String assetType;
+    /**
+     * 资产类型
+     */
+    @ApiModelProperty("资产类型")
+    private String assetTypeCn;
     /**
     * 资产类别
     */
     @ApiModelProperty("资产类别")
     private String assetCategory;
+    /**
+     * 资产类别
+     */
+    @ApiModelProperty("资产类别")
+    private String assetCategoryCn;
     /**
     * 资产种类
     */
     @ApiModelProperty("资产种类")
     private String assetSpecies;
+    /**
+     * 资产种类
+     */
+    @ApiModelProperty("资产种类")
+    private String assetSpeciesCn;
     /**
     * 名称
     */
@@ -80,11 +60,21 @@ public class WfAssetManagePageVo {
     */
     @ApiModelProperty("所属部门[xjr_department]")
     private Long deptId;
+    /**
+     * 所属部门[xjr_department]
+     */
+    @ApiModelProperty("所属部门[xjr_department]")
+    private Long deptIdCn;
     /**
     * 使用人id[xjr_user]
     */
     @ApiModelProperty("使用人id[xjr_user]")
     private Long userId;
+    /**
+     * 使用人id[xjr_user]
+     */
+    @ApiModelProperty("使用人id[xjr_user]")
+    private Long userIdCn;
     /**
     * 金额
     */

src/main/java/com/xjrsoft/module/organization/dto/AddUserDto.java

@@ -96,7 +96,6 @@ public class AddUserDto implements Serializable {
     @ApiModelProperty("qq号码")
     private String qqNumber;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("生日")
     private LocalDate birthDate;
 

src/main/java/com/xjrsoft/module/system/dto/DictionaryItemPageDto.java

@@ -19,6 +19,6 @@ public class DictionaryItemPageDto extends PageInput {
     private String name;
 
     @ApiModelProperty(value = "数据字典项目编码")
-    @Length(max = 10,message = "编码长度不超过10个字符")
+    @Length(max = 20,message = "编码长度不超过20个字符")
     private String code;
 }

src/main/resources/mapper/oa/OfficialDocumentPostMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.oa.mapper.OfficialDocumentPostMapper">
     <select id="getMaxPostNumber" resultType="java.lang.Integer">
-        SELECT IFNULL(MAX(SUBSTR(received_number, 6, 3)), 0) + 1 FROM official_document_received WHERE YEAR(received_date) = YEAR(NOW())
+        SELECT IFNULL(MAX(SUBSTR(post_number, 6, 3)), 0) + 1 FROM official_document_post WHERE YEAR(post_date) = YEAR(NOW())
     </select>
 
 </mapper>