Преглед изворни кода

客户管理 标签管理 瑕疵管理

jz.kai пре 1 година
родитељ
комит
566e0a93ef
20 измењених фајлова са 1456 додато и 1 уклоњено
  1. 18 0
      common/src/main/java/com/jpsoft/printing/modules/base/dao/CustomerDAO.java
  2. 18 0
      common/src/main/java/com/jpsoft/printing/modules/base/dao/FlawDAO.java
  3. 18 0
      common/src/main/java/com/jpsoft/printing/modules/base/dao/LabelDAO.java
  4. 41 0
      common/src/main/java/com/jpsoft/printing/modules/base/entity/Customer.java
  5. 37 0
      common/src/main/java/com/jpsoft/printing/modules/base/entity/Flaw.java
  6. 37 0
      common/src/main/java/com/jpsoft/printing/modules/base/entity/Label.java
  7. 17 0
      common/src/main/java/com/jpsoft/printing/modules/base/service/CustomerService.java
  8. 17 0
      common/src/main/java/com/jpsoft/printing/modules/base/service/FlawService.java
  9. 17 0
      common/src/main/java/com/jpsoft/printing/modules/base/service/LabelService.java
  10. 70 0
      common/src/main/java/com/jpsoft/printing/modules/base/service/impl/CustomerServiceImpl.java
  11. 70 0
      common/src/main/java/com/jpsoft/printing/modules/base/service/impl/FlawServiceImpl.java
  12. 70 0
      common/src/main/java/com/jpsoft/printing/modules/base/service/impl/LabelServiceImpl.java
  13. 103 0
      common/src/main/resources/mapper/base/Customer.xml
  14. 87 0
      common/src/main/resources/mapper/base/Flaw.xml
  15. 87 0
      common/src/main/resources/mapper/base/Label.xml
  16. 253 0
      web/src/main/java/com/jpsoft/printing/modules/base/controller/CustomerController.java
  17. 247 0
      web/src/main/java/com/jpsoft/printing/modules/base/controller/FlawController.java
  18. 247 0
      web/src/main/java/com/jpsoft/printing/modules/base/controller/LabelController.java
  19. 1 0
      web/src/main/java/com/jpsoft/printing/modules/sys/controller/MenuController.java
  20. 1 1
      web/src/main/resources/application.yml

+ 18 - 0
common/src/main/java/com/jpsoft/printing/modules/base/dao/CustomerDAO.java

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

+ 18 - 0
common/src/main/java/com/jpsoft/printing/modules/base/dao/FlawDAO.java

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

+ 18 - 0
common/src/main/java/com/jpsoft/printing/modules/base/dao/LabelDAO.java

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

+ 41 - 0
common/src/main/java/com/jpsoft/printing/modules/base/entity/Customer.java

@@ -0,0 +1,41 @@
+package com.jpsoft.printing.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_customer的实体类
+ */
+@Data
+@ApiModel(value = "base_customer的实体类")
+public class Customer {
+        @ApiModelProperty(value = "客户ID")
+    private String id;
+        @ApiModelProperty(value = "公司")
+    private String company;
+        @ApiModelProperty(value = "联系人")
+    private String name;
+        @ApiModelProperty(value = "联系电话")
+    private String phone;
+        @ApiModelProperty(value = "删除标示")
+    private Boolean delFlag;
+        @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;
+}

+ 37 - 0
common/src/main/java/com/jpsoft/printing/modules/base/entity/Flaw.java

@@ -0,0 +1,37 @@
+package com.jpsoft.printing.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_flaw的实体类
+ */
+@Data
+@ApiModel(value = "base_flaw的实体类")
+public class Flaw {
+        @ApiModelProperty(value = "瑕疵ID")
+    private String id;
+        @ApiModelProperty(value = "瑕疵名")
+    private String name;
+        @ApiModelProperty(value = "删除标示")
+    private Boolean delFlag;
+        @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;
+}

+ 37 - 0
common/src/main/java/com/jpsoft/printing/modules/base/entity/Label.java

@@ -0,0 +1,37 @@
+package com.jpsoft.printing.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_label的实体类
+ */
+@Data
+@ApiModel(value = "base_label的实体类")
+public class Label {
+        @ApiModelProperty(value = "标签ID")
+    private String id;
+        @ApiModelProperty(value = "标签名")
+    private String name;
+        @ApiModelProperty(value = "删除标示")
+    private Boolean delFlag;
+        @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;
+}

+ 17 - 0
common/src/main/java/com/jpsoft/printing/modules/base/service/CustomerService.java

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

+ 17 - 0
common/src/main/java/com/jpsoft/printing/modules/base/service/FlawService.java

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

+ 17 - 0
common/src/main/java/com/jpsoft/printing/modules/base/service/LabelService.java

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

+ 70 - 0
common/src/main/java/com/jpsoft/printing/modules/base/service/impl/CustomerServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.printing.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.printing.modules.base.dao.CustomerDAO;
+import com.jpsoft.printing.modules.base.entity.Customer;
+import com.jpsoft.printing.modules.base.service.CustomerService;
+import com.github.pagehelper.Page;
+import com.jpsoft.printing.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="customerService")
+public class CustomerServiceImpl implements CustomerService {
+	@Resource(name="customerDAO")
+	private CustomerDAO customerDAO;
+
+	@Override
+	public Customer get(String id) {
+		// TODO Auto-generated method stub
+		return customerDAO.get(id);
+	}
+
+	@Override
+	public int insert(Customer model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return customerDAO.insert(model);
+	}
+
+	@Override
+	public int update(Customer model) {
+		// TODO Auto-generated method stub
+		return customerDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return customerDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = customerDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<Customer> list() {
+		// TODO Auto-generated method stub
+		return customerDAO.list();
+	}
+		
+	@Override
+	public Page<Customer> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<Customer> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            customerDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 70 - 0
common/src/main/java/com/jpsoft/printing/modules/base/service/impl/FlawServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.printing.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.printing.modules.base.dao.FlawDAO;
+import com.jpsoft.printing.modules.base.entity.Flaw;
+import com.jpsoft.printing.modules.base.service.FlawService;
+import com.github.pagehelper.Page;
+import com.jpsoft.printing.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="flawService")
+public class FlawServiceImpl implements FlawService {
+	@Resource(name="flawDAO")
+	private FlawDAO flawDAO;
+
+	@Override
+	public Flaw get(String id) {
+		// TODO Auto-generated method stub
+		return flawDAO.get(id);
+	}
+
+	@Override
+	public int insert(Flaw model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return flawDAO.insert(model);
+	}
+
+	@Override
+	public int update(Flaw model) {
+		// TODO Auto-generated method stub
+		return flawDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return flawDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = flawDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<Flaw> list() {
+		// TODO Auto-generated method stub
+		return flawDAO.list();
+	}
+		
+	@Override
+	public Page<Flaw> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<Flaw> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            flawDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 70 - 0
common/src/main/java/com/jpsoft/printing/modules/base/service/impl/LabelServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.printing.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.printing.modules.base.dao.LabelDAO;
+import com.jpsoft.printing.modules.base.entity.Label;
+import com.jpsoft.printing.modules.base.service.LabelService;
+import com.github.pagehelper.Page;
+import com.jpsoft.printing.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="labelService")
+public class LabelServiceImpl implements LabelService {
+	@Resource(name="labelDAO")
+	private LabelDAO labelDAO;
+
+	@Override
+	public Label get(String id) {
+		// TODO Auto-generated method stub
+		return labelDAO.get(id);
+	}
+
+	@Override
+	public int insert(Label model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return labelDAO.insert(model);
+	}
+
+	@Override
+	public int update(Label model) {
+		// TODO Auto-generated method stub
+		return labelDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return labelDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = labelDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<Label> list() {
+		// TODO Auto-generated method stub
+		return labelDAO.list();
+	}
+		
+	@Override
+	public Page<Label> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<Label> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            labelDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

+ 103 - 0
common/src/main/resources/mapper/base/Customer.xml

@@ -0,0 +1,103 @@
+<?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.printing.modules.base.dao.CustomerDAO">
+	<resultMap id="CustomerMap" type="com.jpsoft.printing.modules.base.entity.Customer">
+		<id property="id" column="id_" />
+			<result property="company" column="company_" />
+			<result property="name" column="name_" />
+			<result property="phone" column="phone_" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.printing.modules.base.entity.Customer">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_customer
+	    (id_,company_,name_,phone_,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{company,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_customer where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.printing.modules.base.entity.Customer">
+		update base_customer
+		<set>
+				<if test="company!=null">
+		company_=#{company,jdbcType=VARCHAR},
+		</if>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</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>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="CustomerMap">
+		select 
+id_,company_,name_,phone_,del_flag,create_by,create_time,update_by,update_time		from base_customer where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_customer where id_=#{0}
+	</select>
+	<select id="list" resultMap="CustomerMap">
+		select * from base_customer
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="CustomerMap">
+		<![CDATA[
+			select * from base_customer
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.company != null">
+				and company_ like #{searchParams.company}
+			</if>
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
+			</if>
+			<if test="searchParams.phone != null">
+				and phone_ like #{searchParams.phone}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 87 - 0
common/src/main/resources/mapper/base/Flaw.xml

@@ -0,0 +1,87 @@
+<?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.printing.modules.base.dao.FlawDAO">
+	<resultMap id="FlawMap" type="com.jpsoft.printing.modules.base.entity.Flaw">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.printing.modules.base.entity.Flaw">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_flaw
+	    (id_,name_,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_flaw where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.printing.modules.base.entity.Flaw">
+		update base_flaw
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</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>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="FlawMap">
+		select 
+id_,name_,del_flag,create_by,create_time,update_by,update_time		from base_flaw where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_flaw where id_=#{0}
+	</select>
+	<select id="list" resultMap="FlawMap">
+		select * from base_flaw
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="FlawMap">
+		<![CDATA[
+			select * from base_flaw
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 87 - 0
common/src/main/resources/mapper/base/Label.xml

@@ -0,0 +1,87 @@
+<?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.printing.modules.base.dao.LabelDAO">
+	<resultMap id="LabelMap" type="com.jpsoft.printing.modules.base.entity.Label">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.printing.modules.base.entity.Label">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_label
+	    (id_,name_,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_label where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.printing.modules.base.entity.Label">
+		update base_label
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</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>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="LabelMap">
+		select 
+id_,name_,del_flag,create_by,create_time,update_by,update_time		from base_label where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_label where id_=#{0}
+	</select>
+	<select id="list" resultMap="LabelMap">
+		select * from base_label
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="LabelMap">
+		<![CDATA[
+			select * from base_label
+		]]>
+		<where>
+			del_flag = 0
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

+ 253 - 0
web/src/main/java/com/jpsoft/printing/modules/base/controller/CustomerController.java

@@ -0,0 +1,253 @@
+package com.jpsoft.printing.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.printing.modules.common.utils.PojoUtils;
+import com.jpsoft.printing.modules.common.dto.Sort;
+import com.jpsoft.printing.modules.common.dto.MessageResult;
+import com.jpsoft.printing.modules.base.entity.Customer;
+import com.jpsoft.printing.modules.base.service.CustomerService;
+import com.jpsoft.printing.modules.sys.service.SysLogService;
+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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/customer")
+@Api(description = "customer")
+public class CustomerController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private SysLogService sysLogService;
+    @Autowired
+    private CustomerService customerService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<Customer> create(){
+        MessageResult<Customer> msgResult = new MessageResult<>();
+
+        Customer customer = new Customer();
+
+        msgResult.setData(customer);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    @Transactional(rollbackFor = Exception.class)
+    public MessageResult<Customer> add(@RequestBody Customer customer,@RequestAttribute String subject,HttpServletRequest request){
+        Long begin = System.currentTimeMillis();
+        MessageResult<Customer> msgResult = new MessageResult<>();
+
+        try {
+            customer.setId(UUID.randomUUID().toString());
+            customer.setDelFlag(false);
+            customer.setCreateBy(subject);
+            customer.setCreateTime(new Date());
+            
+            int affectCount = customerService.insert(customer);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(customer);
+                msgResult.setMessage("数据库添加成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+
+            Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),customer.toString(),end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<Customer> edit(@PathVariable("id") String id){
+        MessageResult<Customer> msgResult = new MessageResult<>();
+
+        try {
+            Customer customer = customerService.get(id);
+
+            if (customer != null) {
+                msgResult.setResult(true);
+                msgResult.setData(customer);
+            } 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")
+    @Transactional(rollbackFor = Exception.class)
+    public MessageResult<Customer> update(@RequestBody Customer customer,@RequestAttribute String subject,HttpServletRequest request){
+        Long begin = System.currentTimeMillis();
+        MessageResult<Customer> msgResult = new MessageResult<>();
+
+        try {
+            customer.setUpdateBy(subject);
+            customer.setUpdateTime(new Date());
+            
+            int affectCount = customerService.update(customer);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(customer);
+                msgResult.setMessage("数据库更新成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+
+            Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),customer.toString(),end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    @Transactional(rollbackFor = Exception.class)
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject,HttpServletRequest request){
+        Long begin = System.currentTimeMillis();
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Customer customer = customerService.get(id);
+            customer.setDelFlag(true);
+            customer.setUpdateBy(subject);
+            customer.setUpdateTime(new Date());
+
+            int affectCount = customerService.update(customer);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+                msgResult.setMessage("删除成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+
+            Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),id,end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    @Transactional(rollbackFor = Exception.class)
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject,HttpServletRequest request){
+        Long begin = System.currentTimeMillis();
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                Customer customer = customerService.get(id);
+                customer.setDelFlag(true);
+                customer.setUpdateBy(subject);
+                customer.setUpdateTime(new Date());
+
+                affectCount += customerService.update(customer);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+                msgResult.setMessage("删除成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+
+            Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),String.join(",",idList),end-begin,null,msgResult.getMessage());
+        }
+        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 company, String name, String phone,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+		if (StringUtils.isNotEmpty(company)) {
+            searchParams.put("company","%" + company + "%");
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
+        }
+        if (StringUtils.isNotEmpty(phone)) {
+            searchParams.put("phone","%" + phone + "%");
+        }
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        Page<Customer> page = customerService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 247 - 0
web/src/main/java/com/jpsoft/printing/modules/base/controller/FlawController.java

@@ -0,0 +1,247 @@
+package com.jpsoft.printing.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.printing.modules.common.utils.PojoUtils;
+import com.jpsoft.printing.modules.common.dto.Sort;
+import com.jpsoft.printing.modules.common.dto.MessageResult;
+import com.jpsoft.printing.modules.base.entity.Flaw;
+import com.jpsoft.printing.modules.base.service.FlawService;
+import com.jpsoft.printing.modules.sys.service.SysLogService;
+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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/flaw")
+@Api(description = "flaw")
+public class FlawController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+	@Autowired
+    private SysLogService sysLogService;
+    @Autowired
+    private FlawService flawService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<Flaw> create(){
+        MessageResult<Flaw> msgResult = new MessageResult<>();
+
+        Flaw flaw = new Flaw();
+
+        msgResult.setData(flaw);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Flaw> add(@RequestBody Flaw flaw,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Flaw> msgResult = new MessageResult<>();
+
+        try {
+            flaw.setId(UUID.randomUUID().toString());
+            flaw.setDelFlag(false);
+            flaw.setCreateBy(subject);
+            flaw.setCreateTime(new Date());
+            
+            int affectCount = flawService.insert(flaw);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(flaw);
+				msgResult.setMessage("数据库添加成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),flaw.toString(),end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<Flaw> edit(@PathVariable("id") String id){
+        MessageResult<Flaw> msgResult = new MessageResult<>();
+
+        try {
+            Flaw flaw = flawService.get(id);
+
+            if (flaw != null) {
+                msgResult.setResult(true);
+                msgResult.setData(flaw);
+            } 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")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Flaw> update(@RequestBody Flaw flaw,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Flaw> msgResult = new MessageResult<>();
+
+        try {
+            flaw.setUpdateBy(subject);
+            flaw.setUpdateTime(new Date());
+            
+            int affectCount = flawService.update(flaw);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(flaw);
+				msgResult.setMessage("数据库更新成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),flaw.toString(),end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Flaw flaw = flawService.get(id);
+            flaw.setDelFlag(true);
+            flaw.setUpdateBy(subject);
+            flaw.setUpdateTime(new Date());
+
+            int affectCount = flawService.update(flaw);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+				msgResult.setMessage("删除成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),id,end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                Flaw flaw = flawService.get(id);
+                flaw.setDelFlag(true);
+                flaw.setUpdateBy(subject);
+                flaw.setUpdateTime(new Date());
+
+                affectCount += flawService.update(flaw);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+				msgResult.setMessage("删除成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),String.join(",",idList),end-begin,null,msgResult.getMessage());
+        }
+        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 name,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+		if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
+        }
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        Page<Flaw> page = flawService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 247 - 0
web/src/main/java/com/jpsoft/printing/modules/base/controller/LabelController.java

@@ -0,0 +1,247 @@
+package com.jpsoft.printing.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.printing.modules.common.utils.PojoUtils;
+import com.jpsoft.printing.modules.common.dto.Sort;
+import com.jpsoft.printing.modules.common.dto.MessageResult;
+import com.jpsoft.printing.modules.base.entity.Label;
+import com.jpsoft.printing.modules.base.service.LabelService;
+import com.jpsoft.printing.modules.sys.service.SysLogService;
+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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/label")
+@Api(description = "label")
+public class LabelController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+	@Autowired
+    private SysLogService sysLogService;
+    @Autowired
+    private LabelService labelService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<Label> create(){
+        MessageResult<Label> msgResult = new MessageResult<>();
+
+        Label label = new Label();
+
+        msgResult.setData(label);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Label> add(@RequestBody Label label,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Label> msgResult = new MessageResult<>();
+
+        try {
+            label.setId(UUID.randomUUID().toString());
+            label.setDelFlag(false);
+            label.setCreateBy(subject);
+            label.setCreateTime(new Date());
+            
+            int affectCount = labelService.insert(label);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(label);
+				msgResult.setMessage("数据库添加成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),label.toString(),end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<Label> edit(@PathVariable("id") String id){
+        MessageResult<Label> msgResult = new MessageResult<>();
+
+        try {
+            Label label = labelService.get(id);
+
+            if (label != null) {
+                msgResult.setResult(true);
+                msgResult.setData(label);
+            } 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")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Label> update(@RequestBody Label label,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Label> msgResult = new MessageResult<>();
+
+        try {
+            label.setUpdateBy(subject);
+            label.setUpdateTime(new Date());
+            
+            int affectCount = labelService.update(label);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(label);
+				msgResult.setMessage("数据库更新成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),label.toString(),end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Label label = labelService.get(id);
+            label.setDelFlag(true);
+            label.setUpdateBy(subject);
+            label.setUpdateTime(new Date());
+
+            int affectCount = labelService.update(label);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+				msgResult.setMessage("删除成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),id,end-begin,null,msgResult.getMessage());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+	@Transactional(rollbackFor = Exception.class)
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject,HttpServletRequest request){
+		Long begin = System.currentTimeMillis();
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                Label label = labelService.get(id);
+                label.setDelFlag(true);
+                label.setUpdateBy(subject);
+                label.setUpdateTime(new Date());
+
+                affectCount += labelService.update(label);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+				msgResult.setMessage("删除成功");
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+			
+			Long end = System.currentTimeMillis();
+            sysLogService.addLog(subject,request.getRemoteAddr(),request.getServletPath(),String.join(",",idList),end-begin,null,msgResult.getMessage());
+        }
+        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 name,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+		if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
+        }
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        Page<Label> page = labelService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

+ 1 - 0
web/src/main/java/com/jpsoft/printing/modules/sys/controller/MenuController.java

@@ -59,6 +59,7 @@ public class MenuController {
             if (affectCount > 0) {
                 msgResult.setResult(true);
                 msgResult.setData(menu);
+                msgResult.setMessage("数据库添加成功");
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");

+ 1 - 1
web/src/main/resources/application.yml

@@ -56,7 +56,7 @@ spring:
     restart:
       enabled: true
   profiles:
-    active: @active.profile@
+    active: dev
   redis:
     # Redis数据库索引(默认为0)
     database: 0