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

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java

@@ -4,21 +4,20 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcServiceProjectDTO;
 import com.epmet.dto.form.ServiceProjectFormDTO;
 import com.epmet.dto.form.ServiceProjectListFormDTO;
 import com.epmet.service.IcServiceProjectService;
+import com.epmet.service.IcServiceRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -35,6 +34,9 @@ public class IcServiceProjectController {
 
     @Autowired
     private IcServiceProjectService icServiceProjectService;
+    @Autowired
+    private IcServiceRecordService icServiceRecordService;
+
 
     @RequestMapping("page")
     public Result<PageData<IcServiceProjectDTO>> page(@RequestParam Map<String, Object> params){
@@ -129,4 +131,15 @@ public class IcServiceProjectController {
         return new Result();
     }
 
+    /**
+     * http://yapi.elinkservice.cn/project/245/interface/api/7820
+     *
+     * @param serviceId
+     * @return 【服务项目记录】取消：进行中的项目可以取消。删除该记录
+     */
+    @PostMapping("service/cancel/{service-id}")
+    public Result cancelService(@LoginUser TokenDto tokenDto, @PathVariable("service-id") String serviceId) {
+        icServiceRecordService.cancelService(serviceId, tokenDto.getUserId());
+        return new Result();
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcServiceRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Mapper
+public interface IcServiceRecordDao extends BaseDao<IcServiceRecordEntity> {
+	
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceScopeDao.java

@@ -0,0 +1,18 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcServiceScopeEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Mapper
+public interface IcServiceScopeDao extends BaseDao<IcServiceScopeEntity> {
+
+    int update(@Param("serviceId") String serviceId, @Param("userId") String userId);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordEntity.java

@@ -0,0 +1,79 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_service_record")
+public class IcServiceRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 服务类别ID
+     */
+	private String serviceCategoryId;
+
+    /**
+     * 服务项目ID
+     */
+	private String serviceProjectId;
+
+    /**
+     * 服务项目名称
+     */
+	private String serviceProjectName;
+
+    /**
+     * 服务组织ID
+     */
+	private String serviceOrgId;
+
+    /**
+     * 服务组织名称
+     */
+	private String serviceOrgName;
+
+    /**
+     * 经办人姓名
+     */
+	private String principalName;
+
+    /**
+     * 联系方式
+     */
+	private String principalContact;
+
+    /**
+     * 服务时间
+     */
+	private Date serviceTimeStart;
+
+    /**
+     * 服务截止时间
+     */
+	private Date serviceTimeEnd;
+
+    /**
+     * in_service服务中；completed:已完成
+     */
+	private String serviceStatus;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceScopeEntity.java

@@ -0,0 +1,69 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_service_scope")
+public class IcServiceScopeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 服务类别ID
+     */
+	private String serviceCategoryId;
+
+    /**
+     * 服务项目ID
+     */
+	private String serviceProjectId;
+
+    /**
+     * 服务组织ID
+     */
+	private String serviceOrgId;
+
+    /**
+     * 服务记录的ID
+     */
+	private String serviceRecordId;
+
+    /**
+     * agency单位；grid网格；neighborhood小区
+     */
+	private String objectType;
+
+    /**
+     * 选中的组织的ID
+     */
+	private String objectId;
+
+    /**
+     * 发布范围的组织ID PATH
+     */
+	private String objectIdPath;
+
+    /**
+     * 
+     */
+	private String objectName;
+
+    /**
+     * 备注
+     */
+	private String remark;
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordService.java

@@ -0,0 +1,20 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.IcServiceRecordEntity;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+public interface IcServiceRecordService extends BaseService<IcServiceRecordEntity> {
+
+    /**
+     * http://yapi.elinkservice.cn/project/245/interface/api/7820
+     * @param serviceId
+     * 【服务项目记录】取消：进行中的项目可以取消。删除该记录
+     */
+    void cancelService(String serviceId,String userId);
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceScopeService.java

@@ -0,0 +1,14 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.IcServiceScopeEntity;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+public interface IcServiceScopeService extends BaseService<IcServiceScopeEntity> {
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java

@@ -0,0 +1,51 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.dao.IcServiceRecordDao;
+import com.epmet.dao.IcServiceScopeDao;
+import com.epmet.entity.IcServiceRecordEntity;
+import com.epmet.service.IcServiceRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Service
+public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordDao, IcServiceRecordEntity> implements IcServiceRecordService {
+    @Autowired
+    private IcServiceScopeDao icServiceScopeDao;
+
+    /**
+     * http://yapi.elinkservice.cn/project/245/interface/api/7820
+     *
+     * @param serviceId 【服务项目记录】取消：进行中的项目可以取消。删除该记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelService(String serviceId,String userId) {
+        IcServiceRecordEntity icServiceRecordEntity=queryRecordEntity(serviceId);
+        baseDao.deleteById(serviceId);
+        icServiceScopeDao.update(serviceId,userId);
+    }
+
+    private IcServiceRecordEntity queryRecordEntity(String serviceId) {
+        IcServiceRecordEntity icServiceRecordEntity = baseDao.selectById(serviceId);
+        if (null == icServiceRecordEntity) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),String.format("服务记录不存在，serviceId:%s",serviceId),"服务记录不存在");
+        }
+        if (!"in_service".equals(icServiceRecordEntity.getServiceStatus())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("服务状态：%s", icServiceRecordEntity.getServiceStatus()), "只有服务中的项目可以取消");
+        }
+        return icServiceRecordEntity;
+    }
+
+
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceScopeServiceImpl.java

@@ -0,0 +1,33 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcServiceScopeDao;
+import com.epmet.dto.IcServiceScopeDTO;
+import com.epmet.entity.IcServiceScopeEntity;
+import com.epmet.redis.IcServiceScopeRedis;
+import com.epmet.service.IcServiceScopeService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-30
+ */
+@Service
+public class IcServiceScopeServiceImpl extends BaseServiceImpl<IcServiceScopeDao, IcServiceScopeEntity> implements IcServiceScopeService {
+
+
+}

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml

@@ -0,0 +1,28 @@
+<?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="com.epmet.dao.IcServiceRecordDao">
+
+    <resultMap type="com.epmet.entity.IcServiceRecordEntity" id="icServiceRecordMap">
+        <result property="id" column="ID"/>
+        <result property="serviceCategoryId" column="SERVICE_CATEGORY_ID"/>
+        <result property="serviceProjectId" column="SERVICE_PROJECT_ID"/>
+        <result property="serviceProjectName" column="SERVICE_PROJECT_NAME"/>
+        <result property="serviceOrgId" column="SERVICE_ORG_ID"/>
+        <result property="serviceOrgName" column="SERVICE_ORG_NAME"/>
+        <result property="principalName" column="PRINCIPAL_NAME"/>
+        <result property="principalContact" column="PRINCIPAL_CONTACT"/>
+        <result property="serviceTimeStart" column="SERVICE_TIME_START"/>
+        <result property="serviceTimeEnd" column="SERVICE_TIME_END"/>
+        <result property="serviceStatus" column="SERVICE_STATUS"/>
+        <result property="remark" column="REMARK"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml

@@ -0,0 +1,29 @@
+<?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="com.epmet.dao.IcServiceScopeDao">
+
+    <resultMap type="com.epmet.entity.IcServiceScopeEntity" id="icServiceScopeMap">
+        <result property="id" column="ID"/>
+        <result property="serviceCategoryId" column="SERVICE_CATEGORY_ID"/>
+        <result property="serviceProjectId" column="SERVICE_PROJECT_ID"/>
+        <result property="serviceOrgId" column="SERVICE_ORG_ID"/>
+        <result property="serviceRecordId" column="SERVICE_RECORD_ID"/>
+        <result property="objectType" column="OBJECT_TYPE"/>
+        <result property="objectId" column="OBJECT_ID"/>
+        <result property="objectIdPath" column="OBJECT_ID_PATH"/>
+        <result property="objectName" column="OBJECT_NAME"/>
+        <result property="remark" column="REMARK"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+    <update id="update" parameterType="map">
+        update ic_service_scope set del_flag='1',updatedTime=now(),updatedBy=#{userId}
+        where SERVICE_RECORD_ID=#{serviceId}
+    </update>
+</mapper>