接口补充

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/UserOpinionGoodDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.dto;
+
+import org.springblade.business.entity.UserOpinionGood;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 点赞记录表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-06-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserOpinionGoodDTO extends UserOpinionGood {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/UserOpinionGood.java

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 点赞记录表实体类
+ *
+ * @author BladeX
+ * @since 2022-06-21
+ */
+@Data
+@TableName("u_user_opinion_good")
+@EqualsAndHashCode(callSuper = true)
+public class UserOpinionGood extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * u_user_opinion id
+     */
+    private Long userOpinionId;
+
+    public UserOpinionGood(Long userOpinionId, Long userId, Long deptId){
+        this.userOpinionId = userOpinionId;
+        this.setCreateUser(userId);
+        this.setCreateDept(deptId);
+        this.setCreateTime(new Date());
+    }
+
+    public UserOpinionGood(){}
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/UserOpinionGoodVO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.vo;
+
+import org.springblade.business.entity.UserOpinionGood;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 点赞记录表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-06-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserOpinionGoodVO extends UserOpinionGood {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/UserOpinionVO.java

@@ -68,4 +68,7 @@ public class UserOpinionVO extends UserOpinion {
 	@ApiModelProperty(value = "用户头像")
 	private String avatar;
 
+	@ApiModelProperty(value = "当前用户是否对当前工单点赞")
+	private Boolean currentUserGood;
+
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractTreeVOS.java

@@ -52,4 +52,7 @@ public class WbsTreeContractTreeVOS {
     @ApiModelProperty("是否被标记为首件")
     private Boolean isFirst;
 
+    @ApiModelProperty("图标")
+    private String iconValue;
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/ContractLogController.java

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.business.entity.ContractLog;
 import org.springblade.business.vo.ContractLogVO;
+import org.springblade.business.vo.FileUserVO;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.manager.feign.WbsTreeContractClient;
@@ -50,6 +51,18 @@ public class ContractLogController extends BladeController {
 
 	private final WbsTreeContractClient wbsTreeContractClient;
 
+	/**
+	 * 获取当前日志类型的填报人
+	 * @param logVo 查询条件
+	 * @return 结果
+	 */
+	@GetMapping("/queryFillUser")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "获取当前日志类型的填报人")
+	public R<List<FileUserVO>> queryFillUser(@RequestBody ContractLogVO logVo){
+		return R.data(this.contractLogService.queryFillUser(logVo));
+	}
+
 	/**
 	 * 施工日志分页
 	 * @param logVo 查询条件

blade-service/blade-business/src/main/java/org/springblade/business/controller/UserOpinionController.java

@@ -13,8 +13,10 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.springblade.business.entity.UserOpinionFile;
 import org.springblade.business.entity.UserOpinionFlow;
+import org.springblade.business.entity.UserOpinionGood;
 import org.springblade.business.service.IUserOpinionFileService;
 import org.springblade.business.service.IUserOpinionFlowService;
+import org.springblade.business.service.IUserOpinionGoodService;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -64,6 +66,8 @@ public class UserOpinionController extends BladeController {
 
 	private final IUserClient userClient;
 
+	private final IUserOpinionGoodService userOpinionGoodService;
+
 	/**
 	 * 取消点赞
 	 * @param userOpinionId 工单ID
@@ -171,6 +175,13 @@ public class UserOpinionController extends BladeController {
 			//获取原本的点赞数
 			Integer oldGood = opinion.getGoodNumber();
 			opinion.setGoodNumber(oldGood == null || oldGood < 0 ? good : oldGood + good);
+
+			//获取当前用户信息
+			BladeUser user = AuthUtil.getUser();
+			Long deptId = user.getDeptId().contains(",") ? Long.parseLong(user.getDeptId().split(",")[0]) : Long.parseLong(user.getDeptId());
+			//保存点赞信息
+			this.userOpinionGoodService.save(new UserOpinionGood(opinion.getId(), user.getUserId(), deptId));
+
 			return R.data(this.userOpinionService.updateById(opinion));
 		}
 		return R.data(-1, false, "数据操作失败");

blade-service/blade-business/src/main/java/org/springblade/business/controller/UserOpinionGoodController.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 点赞记录表 控制器
+ *
+ * @author BladeX
+ * @since 2022-06-21
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/userOpinionGood")
+@Api(value = "点赞记录表", tags = "点赞记录表接口")
+public class UserOpinionGoodController extends BladeController {
+	
+}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMapper.java

@@ -31,6 +31,8 @@ import java.util.List;
  */
 public interface ContractLogMapper extends BaseMapper<ContractLog> {
 
+	List<ContractLog> queryFillUser(@Param("vo") ContractLogVO vo);
+
 	List<ContractLog> constructionLogPage(@Param("current") Integer current, @Param("size") Integer size, @Param("vo") ContractLogVO vo);
 
 	Integer selectPageCount(@Param("vo") ContractLogVO vo);

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMapper.xml

@@ -24,6 +24,10 @@
         <result column="create_user_name" property="createUserName"/>
     </resultMap>
 
+    <select id="queryFillUser" resultMap="contractLogResultMap">
+      select create_user, create_user_name from u_contract_log where is_deleted = 0 and wbs_node_id = #{vo.wbsNodeId}
+    </select>
+
     <select id="constructionLogPage" resultMap="contractLogResultMap">
         select
           id,

blade-service/blade-business/src/main/java/org/springblade/business/mapper/UserOpinionGoodMapper.java

@@ -0,0 +1,33 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.mapper;
+
+import org.springblade.business.entity.UserOpinionGood;
+import org.springblade.business.vo.UserOpinionGoodVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 点赞记录表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-06-21
+ */
+public interface UserOpinionGoodMapper extends BaseMapper<UserOpinionGood> {
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/UserOpinionGoodMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.business.mapper.UserOpinionGoodMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="userOpinionGoodResultMap" type="org.springblade.business.entity.UserOpinionGood">
+        <result column="id" property="id"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="user_opinion_id" property="userOpinionId"/>
+    </resultMap>
+
+</mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/IContractLogService.java

@@ -18,9 +18,12 @@ package org.springblade.business.service;
 
 import org.springblade.business.entity.ContractLog;
 import org.springblade.business.vo.ContractLogVO;
+import org.springblade.business.vo.FileUserVO;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 日志通用表 服务类
  *
@@ -29,6 +32,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface IContractLogService extends BaseService<ContractLog> {
 
+	List<FileUserVO> queryFillUser(ContractLogVO logVO);
+
 	/**
 	 * 施工日志分页
 	 * @param logVO 查询条件

blade-service/blade-business/src/main/java/org/springblade/business/service/IUserOpinionGoodService.java

@@ -0,0 +1,32 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.service;
+
+import org.springblade.business.entity.UserOpinionGood;
+import org.springblade.business.vo.UserOpinionGoodVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 点赞记录表 服务类
+ *
+ * @author BladeX
+ * @since 2022-06-21
+ */
+public interface IUserOpinionGoodService extends BaseService<UserOpinionGood> {
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ContractLogServiceImpl.java

@@ -23,12 +23,14 @@ import org.springblade.business.entity.ContractLog;
 import org.springblade.business.vo.ContractLogVO;
 import org.springblade.business.mapper.ContractLogMapper;
 import org.springblade.business.service.IContractLogService;
+import org.springblade.business.vo.FileUserVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,6 +42,16 @@ import java.util.List;
 @Service
 public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, ContractLog> implements IContractLogService {
 
+	@Override
+	public List<FileUserVO> queryFillUser(ContractLogVO logVO) {
+		List<FileUserVO> result = new ArrayList<>();
+		List<ContractLog> logResult = this.baseMapper.queryFillUser(logVO);
+		if(logResult != null && logResult.size() != 0){
+			logResult.forEach(log -> result.add(new FileUserVO(log.getCreateUser().toString(), log.getCreateUserName())));
+		}
+		return result;
+	}
+
 	@Override
 	public IPage<ContractLogVO> constructionLogPage(ContractLogVO logVO) {
 		Integer current = (logVO.getCurrent() - 1) * logVO.getSize();

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UserOpinionGoodServiceImpl.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.business.service.impl;
+
+import org.springblade.business.entity.UserOpinionGood;
+import org.springblade.business.vo.UserOpinionGoodVO;
+import org.springblade.business.mapper.UserOpinionGoodMapper;
+import org.springblade.business.service.IUserOpinionGoodService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 点赞记录表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-06-21
+ */
+@Service
+public class UserOpinionGoodServiceImpl extends BaseServiceImpl<UserOpinionGoodMapper, UserOpinionGood> implements IUserOpinionGoodService {
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UserOpinionServiceImpl.java

@@ -3,19 +3,18 @@ package org.springblade.business.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.client.utils.DateUtils;
 import org.springblade.business.entity.UserOpinion;
 import org.springblade.business.entity.UserOpinionFile;
-import org.springblade.business.service.IUserOpinionCommentsService;
-import org.springblade.business.service.IUserOpinionFileService;
-import org.springblade.business.service.IUserOpinionFlowService;
+import org.springblade.business.entity.UserOpinionGood;
+import org.springblade.business.service.*;
 import org.springblade.business.vo.BusinessUserOpinionVO;
 import org.springblade.business.vo.UserOpinionFlowVO;
 import org.springblade.business.vo.UserOpinionVO;
 import org.springblade.business.mapper.UserOpinionMapper;
-import org.springblade.business.service.IUserOpinionService;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -48,6 +47,8 @@ public class UserOpinionServiceImpl extends BaseServiceImpl<UserOpinionMapper, U
 
 	private final IUserClient userClient;
 
+	private final IUserOpinionGoodService userOpinionGoodService;
+
 	@Override
 	public IPage<BusinessUserOpinionVO> queryBusinessUserOpinionListAll(Query query) {
 		return this.queryBusinessUserOpinionList(null, query);
@@ -202,6 +203,10 @@ public class UserOpinionServiceImpl extends BaseServiceImpl<UserOpinionMapper, U
 		if(currentUserResult != null && currentUserResult.size() != 0){
 			//有数据，查询相关信息
 			List<UserOpinionVO> resultVo = JSONArray.parseArray(JSONObject.toJSONString(currentUserResult), UserOpinionVO.class);
+
+			//获取当前用户的点赞记录
+			List<UserOpinionGood> userGood = this.userOpinionGoodService.list(Wrappers.<UserOpinionGood>lambdaQuery().eq(UserOpinionGood::getCreateUser, users.getUserId()).eq(UserOpinionGood::getIsDeleted, 0));
+
 			resultVo.forEach(vo -> {
 				//查询相关附件
 				List<UserOpinionFile> files = this.userOpinionFileService.selectUserOpinionFileByUserOpinionKey(vo.getId());
@@ -227,6 +232,18 @@ public class UserOpinionServiceImpl extends BaseServiceImpl<UserOpinionMapper, U
 				}catch (Exception e){
 					e.printStackTrace();
 				}
+
+				//判断是否点赞
+				Iterator<UserOpinionGood> iterator = userGood.iterator();
+				while (iterator.hasNext()){
+					UserOpinionGood next = iterator.next();
+					if(next.getUserOpinionId().equals(vo.getId())){
+						vo.setCurrentUserGood(true);
+						iterator.remove();
+						break;
+					}
+				}
+
 			});
 			return page.setRecords(resultVo);
 		}

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -99,6 +99,40 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
                 while (iterator.hasNext()){
                     WbsTreeContractTreeVOS next = iterator.next();
                     if(next.getTitle().contains(dictBiz.getDictValue())){
+                        //设置图标
+                        switch (next.getDeptCategory()){
+                            case 7:
+                                //施工日志
+                                next.setIconValue("hcicon-Excavator-3");
+                                break;
+                            case 8:
+                                //监理日志
+                                next.setIconValue("hcicon-jianlizixun");
+                                break;
+                            case 9:
+                                //安全日志
+                                next.setIconValue("hcicon-anquan");
+                                break;
+                            case 10:
+                                //监理巡视日志
+                                next.setIconValue("hcicon-zhengkaiyanjing4");
+                                break;
+                            case 11:
+                                //监理旁站日志
+                                next.setIconValue("hcicon-side");
+                                break;
+                            case 12:
+                                //安全监理日志
+                                next.setIconValue("hcicon-jianlifang");
+                                break;
+                            case 13:
+                                //安全巡视日志
+                                next.setIconValue("hcicon-chakan");
+                                break;
+                            default:
+                                break;
+                        }
+
                         finalResult.add(next);
                         iterator.remove();
                         break;