增加通知公告与单位关联表。

common/src/main/java/com/jpsoft/smart/modules/base/dao/MessageNoticeCompanyDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.MessageNoticeCompany;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface MessageNoticeCompanyDAO {
+	int insert(MessageNoticeCompany entity);
+	int update(MessageNoticeCompany entity);
+	int exist(String id);
+	MessageNoticeCompany get(String id);
+	int delete(String id);
+	List<MessageNoticeCompany> list();
+	List<MessageNoticeCompany> search(Map<String,Object> searchParams,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/entity/MessageNoticeCompany.java

@@ -0,0 +1,63 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_message_notice_company的实体类
+ */
+@Data
+@ApiModel(value = "base_message_notice_company的实体类")
+public class MessageNoticeCompany {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private String id;
+	/**
+	 *单位编号
+	 */
+        @ApiModelProperty(value = "单位编号")
+	private String companyId;
+	/**
+	 *通知消息ID
+	 */
+        @ApiModelProperty(value = "通知消息ID")
+	private String noticeId;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+}

common/src/main/java/com/jpsoft/smart/modules/base/service/MessageNoticeCompanyService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.MessageNoticeCompany;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface MessageNoticeCompanyService {
+	MessageNoticeCompany get(String id);
+	boolean exist(String id);
+	int insert(MessageNoticeCompany model);
+	int update(MessageNoticeCompany model);
+	int delete(String id);
+	List<MessageNoticeCompany> list();
+	Page<MessageNoticeCompany> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/MessageNoticeCompanyServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.smart.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.smart.modules.base.dao.MessageNoticeCompanyDAO;
+import com.jpsoft.smart.modules.base.entity.MessageNoticeCompany;
+import com.jpsoft.smart.modules.base.service.MessageNoticeCompanyService;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="messageNoticeCompanyService")
+public class MessageNoticeCompanyServiceImpl implements MessageNoticeCompanyService {
+	@Resource(name="messageNoticeCompanyDAO")
+	private MessageNoticeCompanyDAO messageNoticeCompanyDAO;
+
+	@Override
+	public MessageNoticeCompany get(String id) {
+		// TODO Auto-generated method stub
+		return messageNoticeCompanyDAO.get(id);
+	}
+
+	@Override
+	public int insert(MessageNoticeCompany model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return messageNoticeCompanyDAO.insert(model);
+	}
+
+	@Override
+	public int update(MessageNoticeCompany model) {
+		// TODO Auto-generated method stub
+		return messageNoticeCompanyDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return messageNoticeCompanyDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = messageNoticeCompanyDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<MessageNoticeCompany> list() {
+		// TODO Auto-generated method stub
+		return messageNoticeCompanyDAO.list();
+	}
+		
+	@Override
+	public Page<MessageNoticeCompany> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<MessageNoticeCompany> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            messageNoticeCompanyDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/resources/mapper/base/MessageNoticeCompany.xml

@@ -0,0 +1,91 @@
+<?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">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.MessageNoticeCompanyDAO">
+	<resultMap id="MessageNoticeCompanyMap" type="com.jpsoft.smart.modules.base.entity.MessageNoticeCompany">
+		<id property="id" column="id_" />
+			<result property="companyId" column="company_id" />
+			<result property="noticeId" column="notice_id" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.MessageNoticeCompany">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_message_notice_company
+	    (id_,company_id,notice_id,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{noticeId,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_message_notice_company where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.smart.modules.base.entity.MessageNoticeCompany">
+		update base_message_notice_company
+		<set>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="noticeId!=null">
+		notice_id=#{noticeId,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="MessageNoticeCompanyMap">
+		select 
+id_,company_id,notice_id,create_by,create_time,update_by,update_time,del_flag		from base_message_notice_company where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_message_notice_company where id_=#{0}
+	</select>
+	<select id="list" resultMap="MessageNoticeCompanyMap">
+		select * from base_message_notice_company
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="MessageNoticeCompanyMap">
+		<![CDATA[
+			select * from base_message_notice_company
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

web/src/main/java/com/jpsoft/smart/modules/base/controller/MessageNoticeCompanyController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.smart.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.base.entity.MessageNoticeCompany;
+import com.jpsoft.smart.modules.base.service.MessageNoticeCompanyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/messageNoticeCompany")
+@Api(description = "messageNoticeCompany")
+public class MessageNoticeCompanyController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private MessageNoticeCompanyService messageNoticeCompanyService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<MessageNoticeCompany> create(){
+        MessageResult<MessageNoticeCompany> msgResult = new MessageResult<>();
+
+        MessageNoticeCompany messageNoticeCompany = new MessageNoticeCompany();
+
+        msgResult.setData(messageNoticeCompany);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<MessageNoticeCompany> add(@RequestBody MessageNoticeCompany messageNoticeCompany,@RequestAttribute String subject){
+        MessageResult<MessageNoticeCompany> msgResult = new MessageResult<>();
+
+        try {
+            messageNoticeCompany.setId(UUID.randomUUID().toString());
+            messageNoticeCompany.setDelFlag(false);
+            messageNoticeCompany.setCreateBy(subject);
+            messageNoticeCompany.setCreateTime(new Date());
+            
+            int affectCount = messageNoticeCompanyService.insert(messageNoticeCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(messageNoticeCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<MessageNoticeCompany> edit(@PathVariable("id") String id){
+        MessageResult<MessageNoticeCompany> msgResult = new MessageResult<>();
+
+        try {
+            MessageNoticeCompany messageNoticeCompany = messageNoticeCompanyService.get(id);
+
+            if (messageNoticeCompany != null) {
+                msgResult.setResult(true);
+                msgResult.setData(messageNoticeCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<MessageNoticeCompany> update(@RequestBody MessageNoticeCompany messageNoticeCompany,@RequestAttribute String subject){
+        MessageResult<MessageNoticeCompany> msgResult = new MessageResult<>();
+
+        try {
+            messageNoticeCompany.setUpdateBy(subject);
+            messageNoticeCompany.setUpdateTime(new Date());
+            
+            int affectCount = messageNoticeCompanyService.update(messageNoticeCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(messageNoticeCompany);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            MessageNoticeCompany messageNoticeCompany = messageNoticeCompanyService.get(id);
+            messageNoticeCompany.setDelFlag(true);
+            messageNoticeCompany.setUpdateBy(subject);
+            messageNoticeCompany.setUpdateTime(new Date());
+
+            int affectCount = messageNoticeCompanyService.update(messageNoticeCompany);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                MessageNoticeCompany messageNoticeCompany = messageNoticeCompanyService.get(id);
+                messageNoticeCompany.setDelFlag(true);
+                messageNoticeCompany.setUpdateBy(subject);
+                messageNoticeCompany.setUpdateTime(new Date());
+
+                affectCount += messageNoticeCompanyService.update(messageNoticeCompany);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<MessageNoticeCompany> page = messageNoticeCompanyService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}