[task1455]-新首页日历组件需要数据查询、新增、修改、删除接口

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/domain/PartyUserCalendar.java

@@ -0,0 +1,23 @@
+package com.lc.ibps.org.party.domain;
+
+import com.lc.ibps.base.framework.domain.AbstractDomain;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
+import org.springframework.context.annotation.Scope;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author gaozl
+ */
+@SuppressWarnings("serial")
+@Transactional
+@Scope("prototype")
+public class PartyUserCalendar extends AbstractDomain<String, PartyUserCalendarPo> {
+
+
+    @Override
+    protected void init() {
+
+    }
+
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/PartyUserCalendarDao.java

@@ -0,0 +1,14 @@
+package com.lc.ibps.org.party.persistence.dao;
+
+import com.lc.ibps.base.framework.persistence.dao.IDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
+
+/**
+ * @author gaozl
+ */
+public interface PartyUserCalendarDao extends IDao<String, PartyUserCalendarPo> {
+
+
+
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/PartyUserCalendarQueryDao.java

@@ -0,0 +1,12 @@
+package com.lc.ibps.org.party.persistence.dao;
+
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
+
+/**
+ * @author gaozl
+ */
+public interface PartyUserCalendarQueryDao extends IQueryDao<String, PartyUserCalendarPo> {
+
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/impl/PartyUserCalendarDaoImpl.java

@@ -0,0 +1,20 @@
+package com.lc.ibps.org.party.persistence.dao.impl;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisDaoImpl;
+import com.lc.ibps.org.party.persistence.dao.PartyUserCalendarDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author gaozl
+ */
+@Repository
+public class PartyUserCalendarDaoImpl extends MyBatisDaoImpl<String, PartyUserCalendarPo> implements PartyUserCalendarDao {
+
+
+    @Override
+    public String getNamespace() {
+        return PartyUserCalendarPo.class.getName();
+    }
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/persistence/dao/impl/PartyUserCalendarQueryDaoImpl.java

@@ -0,0 +1,21 @@
+package com.lc.ibps.org.party.persistence.dao.impl;
+
+import com.lc.ibps.base.db.ddd.dao.MyBatisQueryDaoImpl;
+import com.lc.ibps.org.party.persistence.dao.PartyUserCalendarQueryDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author gaozl
+ */
+@SuppressWarnings("serial")
+@Repository
+public class PartyUserCalendarQueryDaoImpl extends MyBatisQueryDaoImpl<String, PartyUserCalendarPo> implements PartyUserCalendarQueryDao {
+
+
+    @Override
+    public String getNamespace() {
+        return PartyUserCalendarPo.class.getName();
+    }
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/repository/PartyUserCalendarRepository.java

@@ -0,0 +1,22 @@
+package com.lc.ibps.org.party.repository;
+
+import com.lc.ibps.base.framework.repository.IRepository;
+import com.lc.ibps.org.party.domain.PartyUserCalendar;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
+
+import java.util.List;
+
+/**
+ * @author gaozl
+ */
+public interface PartyUserCalendarRepository extends IRepository<String, PartyUserCalendarPo, PartyUserCalendar> {
+
+
+    /**
+     * 按用户id查询导航
+     * @param userId
+     * @return
+     */
+    List<PartyUserCalendarPo> findByUserId(String userId);
+
+}

ibps-common-root/modules/org-biz/src/main/java/com/lc/ibps/org/party/repository/impl/PartyUserCalendarRepositoryImpl.java

@@ -0,0 +1,49 @@
+package com.lc.ibps.org.party.repository.impl;
+
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.framework.persistence.dao.IQueryDao;
+import com.lc.ibps.base.framework.repository.AbstractRepository;
+import com.lc.ibps.org.party.domain.PartyUserCalendar;
+import com.lc.ibps.org.party.persistence.dao.PartyUserCalendarQueryDao;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
+import com.lc.ibps.org.party.repository.PartyUserCalendarRepository;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author gaozl
+ */
+@Repository
+public class PartyUserCalendarRepositoryImpl extends AbstractRepository<String, PartyUserCalendarPo, PartyUserCalendar> implements PartyUserCalendarRepository {
+
+    @Resource
+    private PartyUserCalendarQueryDao calendarQueryDao;
+
+    @Override
+    protected IQueryDao<String, PartyUserCalendarPo> getQueryDao() {
+        return calendarQueryDao;
+    }
+
+    @Override
+    public PartyUserCalendar newInstance() {
+        PartyUserCalendarPo calendarPo = new PartyUserCalendarPo();
+        PartyUserCalendar calendar = AppUtil.getBean(PartyUserCalendar.class);
+        calendar.setData(calendarPo);
+        return calendar;
+    }
+
+    @Override
+    public PartyUserCalendar newInstance(PartyUserCalendarPo po) {
+        PartyUserCalendar calendar = AppUtil.getBean(PartyUserCalendar.class);
+        calendar.setData(po);
+        return calendar;
+    }
+
+    @Override
+    public List<PartyUserCalendarPo> findByUserId(String userId) {
+        return findByKey("findByUserId", "findIdsByUserId",
+                b().a("userId", userId).p());
+    }
+}

ibps-model-root/modules/org-model/src/main/java/com/lc/ibps/org/party/persistence/entity/PartyUserCalendarPo.java

@@ -0,0 +1,14 @@
+package com.lc.ibps.org.party.persistence.entity;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @author gaozl
+ */
+@ApiModel(value = "用户导航对象")
+public class PartyUserCalendarPo extends PartyUserCalendarTbl {
+
+    private static final long serialVersionUID = -6087528775945803891L;
+
+
+}

ibps-model-root/modules/org-model/src/main/java/com/lc/ibps/org/party/persistence/entity/PartyUserCalendarTbl.java

@@ -0,0 +1,192 @@
+package com.lc.ibps.org.party.persistence.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lc.ibps.base.core.constants.StringPool;
+import com.lc.ibps.base.framework.persistence.entity.AbstractPo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+ * @author gaozl
+ */
+@ApiModel(value = "日历日程")
+public class PartyUserCalendarTbl extends AbstractPo<String> {
+
+    private static final long serialVersionUID = 3299442194984388574L;
+
+    @ApiModelProperty(value = "主键")
+    protected String id;
+    protected String tenantId;
+    protected String ip;
+    @ApiModelProperty(value = "创建人")
+    protected String createBy;
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = StringPool.DATE_FORMAT_DATETIME, timezone = "GMT+8")
+    protected java.util.Date createTime;
+    protected String updateBy;
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = StringPool.DATE_FORMAT_DATETIME, timezone = "GMT+8")
+    protected java.util.Date updateTime;
+    @ApiModelProperty(value = "用户ID")
+    protected String userId;
+    @ApiModelProperty(value = "地点")
+    protected String diDian;
+    @ApiModelProperty(value = "用户名")
+    protected String userName;
+    @ApiModelProperty(value = "标题")
+    protected String title;
+    @ApiModelProperty(value = "内容")
+    protected String content;
+    @ApiModelProperty(value = "开始时间")
+    protected String startTime;
+    @ApiModelProperty(value = "结束时间")
+    protected String endTime;
+    @ApiModelProperty(value = "紧急状态")
+    protected String emergencyState;
+    @ApiModelProperty(value = "序号")
+    protected String serialNum;
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getId() {
+        return this.id;
+    }
+
+    @Override
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    @Override
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    @Override
+    public String getIp() {
+        return ip;
+    }
+
+    @Override
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    @Override
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    @Override
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    @Override
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    @Override
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    @Override
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getDiDian() {
+        return diDian;
+    }
+
+    public void setDiDian(String diDian) {
+        this.diDian = diDian;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getEmergencyState() {
+        return emergencyState;
+    }
+
+    public void setEmergencyState(String emergencyState) {
+        this.emergencyState = emergencyState;
+    }
+
+    public String getSerialNum() {
+        return serialNum;
+    }
+
+    public void setSerialNum(String serialNum) {
+        this.serialNum = serialNum;
+    }
+}

ibps-model-root/modules/org-model/src/main/resources/com/lc/ibps/org/party/persistence/mapping/PartyUserCalendar.map.xml

@@ -0,0 +1,67 @@
+<?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.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo">
+    <resultMap id="PartyUserCalendar" type="com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo">
+        <id property="id" column="ID_" jdbcType="VARCHAR"/>
+        <result property="tenantId" column="tenant_id_" jdbcType="VARCHAR"/>
+        <result property="ip" column="ip_" jdbcType="VARCHAR"/>
+        <result property="createBy" column="create_by_" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time_" jdbcType="TIMESTAMP"/>
+        <result property="updateBy" column="update_by_" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="update_time_" jdbcType="TIMESTAMP"/>
+        <result property="userId" column="user_id_" jdbcType="VARCHAR"/>
+        <result property="diDian" column="di_dian_" jdbcType="VARCHAR"/>
+        <result property="userName" column="user_name_" jdbcType="VARCHAR"/>
+        <result property="title" column="title_" jdbcType="VARCHAR"/>
+        <result property="content" column="content_" jdbcType="LONGVARCHAR"/>
+        <result property="startTime" column="start_time_" jdbcType="VARCHAR"/>
+        <result property="endTime" column="end_time_" jdbcType="VARCHAR"/>
+        <result property="emergencyState" column="emergency_state_" jdbcType="VARCHAR"/>
+        <result property="serialNum" column="serial_num_" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="columns">
+        id_,tenant_id_,ip_,create_by_,create_time_,update_by_,update_time_,user_id_,di_dian_,user_name_,title_,content_,start_time_,end_time_,emergency_state_,serial_num_
+    </sql>
+
+    <insert id="create" parameterType="com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo">
+        INSERT INTO IBPS_PARTY_USER_CALENDAR
+        (ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,USER_ID_,DI_DIAN_,USER_NAME_,TITLE_,CONTENT_,START_TIME_,END_TIME_,EMERGENCY_STATE_,SERIAL_NUM_)
+        VALUES
+        (#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},#{createBy,jdbcType=VARCHAR},
+         #{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP},#{userId,jdbcType=VARCHAR},
+         #{diDian,jdbcType=VARCHAR},#{userName,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{content,jdbcType=LONGVARCHAR},
+         #{startTime,jdbcType=VARCHAR},#{endTime,jdbcType=VARCHAR},#{emergencyState,jdbcType=VARCHAR},#{serialNum,jdbcType=VARCHAR})
+    </insert>
+
+    <select id="get"  parameterType="java.lang.String" resultMap="PartyUserCalendar">
+        SELECT <include refid="columns"/> FROM IBPS_PARTY_USER_CALENDAR WHERE ID_=#{id}
+    </select>
+
+    <select id="findByUserId"  parameterType="java.util.Map" resultMap="PartyUserCalendar">
+        SELECT <include refid="columns"/> FROM IBPS_PARTY_USER_CALENDAR
+        WHERE USER_ID_ = #{userId}
+    </select>
+
+    <select id="findIdsByUserId"  parameterType="java.util.Map" resultMap="PartyUserCalendar">
+        SELECT ID_ FROM FROM IBPS_PARTY_USER_CALENDAR
+        WHERE USER_ID_ = #{userId}
+    </select>
+
+    <update id="update" parameterType="com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo">
+        UPDATE IBPS_PARTY_USER_CALENDAR SET
+                                            UPDATE_BY_ = #{updateBy,jdbcType=VARCHAR},
+                                            UPDATE_TIME_ = #{updateTime,jdbcType=TIMESTAMP},
+                                            TITLE_ = #{title,jdbcType=VARCHAR},
+                                            CONTENT_ = #{content,jdbcType=LONGVARCHAR},
+                                            START_TIME_ = #{startTime,jdbcType=VARCHAR},
+                                            END_TIME_ = #{endTime,jdbcType=VARCHAR},
+                                            EMERGENCY_STATE_ = #{emergencyState,jdbcType=VARCHAR}
+        WHERE ID_=#{id}
+    </update>
+
+    <delete id="remove" parameterType="java.lang.String">
+        DELETE FROM IBPS_PARTY_USER_CALENDAR WHERE ID_=#{id}
+    </delete>
+
+</mapper>

ibps-provider-base-root/modules/provider-platform-api/src/main/java/com/lc/ibps/common/api/IDesktopFacadeService.java

@@ -4,6 +4,7 @@ import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.common.desktop.entity.Favorites;
 import com.lc.ibps.common.desktop.entity.Infobox;
 import com.lc.ibps.common.system.persistence.entity.NewsPo;
+import com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo;
 import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -178,4 +179,24 @@ public interface IDesktopFacadeService {
 	@RequestMapping(value = "/navigate/remove", method = { RequestMethod.POST })
 	public APIResult<Void> remove(
 			@RequestParam(name = "navigateIds", required = true)String[] navigateIds);
+
+	/**
+	 * 新增 或 修改用户 日历日程
+	 */
+	@RequestMapping(value = "/calendar/save", method = RequestMethod.POST)
+	public APIResult<Void> saveCalendar(
+			@RequestBody(required = true) @Valid PartyUserCalendarPo partyUserCalendarPo);
+
+	/**
+	 * 查询当前用户日历日程
+	 */
+	@RequestMapping(value = "/calendar/findAllByCurrUserId", method = { RequestMethod.GET })
+	public APIResult<List<PartyUserCalendarPo>> findCalendarByUserId();
+
+	/**
+	 * 根据id 删除 日历日程
+	 */
+	@RequestMapping(value = "/calendar/remove", method = { RequestMethod.POST })
+	public APIResult<Void> removeCalendar(
+			@RequestParam(name = "calendarIds", required = true)String[] calendarIds);
 }

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/common/provider/DesktopFacadeProvider.java

@@ -45,13 +45,12 @@ import com.lc.ibps.office.api.IBpmReceivedService;
 import com.lc.ibps.org.auth.persistence.entity.ResourcesPo;
 import com.lc.ibps.org.auth.repository.ResourcesRepository;
 import com.lc.ibps.org.party.domain.PartyUserNavigate;
+import com.lc.ibps.org.party.persistence.dao.PartyUserCalendarDao;
 import com.lc.ibps.org.party.persistence.dao.PartyUserNavigateDao;
-import com.lc.ibps.org.party.persistence.entity.PartyEmployeePo;
-import com.lc.ibps.org.party.persistence.entity.PartyPositionPo;
-import com.lc.ibps.org.party.persistence.entity.PartyUserNavigatePo;
-import com.lc.ibps.org.party.persistence.entity.PartyUserPo;
+import com.lc.ibps.org.party.persistence.entity.*;
 import com.lc.ibps.org.party.repository.PartyEmployeeRepository;
 import com.lc.ibps.org.party.repository.PartyPositionRepository;
+import com.lc.ibps.org.party.repository.PartyUserCalendarRepository;
 import com.lc.ibps.org.party.repository.PartyUserNavigateRepository;
 import com.lc.ibps.org.spi.SpiUserService;
 import com.lc.ibps.org.spi.SpiUserServiceUtil;
@@ -109,10 +108,16 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 	@Resource
 	private PartyUserNavigateDao navigateDao;
 
+	@Resource
+	private PartyUserCalendarDao calendarDao;
+
+	@Resource
+	private PartyUserCalendarRepository calendarRepository;
+
 	private int pageNo = 1;
 	private int limit = 15;
 
-	@ApiOperation(value = "保存", notes = "保存用户导航")
+	@ApiOperation(value = "保存用户导航", notes = "保存用户导航")
 	@Override
 	public APIResult<Void> save(@Valid PartyUserNavigatePo userNavigatePo) {
 		APIResult<Void> result = new APIResult<>();
@@ -153,7 +158,7 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 		return result;
 	}
 
-	@ApiOperation(value = "批量删除", notes = "批量删除用户导航")
+	@ApiOperation(value = "批量删除用户导航", notes = "批量删除用户导航")
 	@Override
 	public APIResult<Void> remove(
 			@ApiParam(name = "navigateIds", value = "用户导航id数组", required = true)
@@ -168,7 +173,61 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 		}
 		return result;
 	}
-	
+
+	@ApiOperation(value = "保存用户日历日程", notes = "保存用户日历日程")
+	@Override
+	public APIResult<Void> saveCalendar(@Valid PartyUserCalendarPo partyUserCalendarPo) {
+		APIResult<Void> result = new APIResult<>();
+		try {
+			String userId = ContextUtil.getCurrentUserId();
+			partyUserCalendarPo.setUserId(userId);
+			partyUserCalendarPo.setIp(ContextUtil.getCurrentUserIp());
+			PartyUserCalendarPo calendarPo = calendarRepository.get(partyUserCalendarPo.getId());
+			if (BeanUtils.isEmpty(calendarPo)){
+				partyUserCalendarPo.setId(UniqueIdUtil.getId());
+				partyUserCalendarPo.setCreateBy(userId);
+				calendarDao.create(partyUserCalendarPo);
+			}else {
+				partyUserCalendarPo.setUpdateBy(userId);
+				partyUserCalendarPo.setUpdateTime(new Date());
+				calendarDao.update(partyUserCalendarPo);
+			}
+			result.setMessage("用户日历日程保存成功！");
+			result.addVariable("id", partyUserCalendarPo.getId());
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "查询当前用户日历日程", notes = "查询当前用户日历日程")
+	@Override
+	public APIResult<List<PartyUserCalendarPo>> findCalendarByUserId() {
+		APIResult<List<PartyUserCalendarPo>> result = new APIResult<>();
+		try {
+			List<PartyUserCalendarPo> calendarPoList = calendarRepository.findByUserId(ContextUtil.getCurrentUserId());
+			result.setData(calendarPoList);
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+		}
+		return result;
+	}
+
+	@ApiOperation(value = "批量删除用户日历日程", notes = "批量删除用户日历日程")
+	@Override
+	public APIResult<Void> removeCalendar(
+			@ApiParam(name = "calendarIds", value = "用户导航id数组", required = true)
+			@RequestParam(name = "calendarIds", required = true)String[] calendarIds) {
+		APIResult<Void> result = new APIResult<>();
+		try {
+			calendarDao.deleteByIds(calendarIds);
+			result.setMessage("删除用户日历日程成功！");
+		} catch (Exception e) {
+			setExceptionResult(result, StateEnum.ERROR_SYSTEM_DESKTOP.getCode(), I18nUtil.getMessage(StateEnum.ERROR_SYSTEM_DESKTOP.getCode()+""), e);
+		}
+		return result;
+	}
+
 	@SuppressWarnings("unchecked")
 	@ApiOperation(value = "个人信息", notes = "个人信息")
 	@Override