语言配置及订单

common/src/main/java/com/jpsoft/order/modules/base/dao/OrderFormDAO.java

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

common/src/main/java/com/jpsoft/order/modules/base/entity/OrderForm.java

@@ -0,0 +1,69 @@
+package com.jpsoft.order.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_order_form的实体类
+ */
+@Data
+@ApiModel(value = "base_order_form的实体类")
+public class OrderForm {
+        @ApiModelProperty(value = "编号")
+    private String id;
+        @ApiModelProperty(value = "客户邮箱")
+    private String clientEmail;
+        @ApiModelProperty(value = "客户名称")
+    private String clientName;
+        @ApiModelProperty(value = "客户订单号")
+    private String clientOrderNumber;
+        @ApiModelProperty(value = "菲利华订单号")
+    private String feilihuaOrderNumber;
+        @ApiModelProperty(value = "产品名称")
+    private String productName;
+        @ApiModelProperty(value = "牌号")
+    private String trademark;
+        @ApiModelProperty(value = "产品规格")
+    private String productSpecification;
+        @ApiModelProperty(value = "订单数量")
+    private Integer orderQuantity;
+        @ApiModelProperty(value = "单位")
+    private String unit;
+        @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	    @ApiModelProperty(value = "要求交期")
+    private Date requiredDeliveryTime;
+        @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	    @ApiModelProperty(value = "评审交期")
+    private Date reviewDeliveryTime;
+        @ApiModelProperty(value = "库存数量")
+    private Integer stockQuantity;
+        @ApiModelProperty(value = "还需生产数量")
+    private Integer productionQuantity;
+        @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	    @ApiModelProperty(value = "过期时间")
+    private Date expiryTime;
+        @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;
+}

common/src/main/java/com/jpsoft/order/modules/base/service/OrderFormService.java

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

common/src/main/java/com/jpsoft/order/modules/base/service/impl/OrderFormServiceImpl.java

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

common/src/main/java/com/jpsoft/order/modules/sys/dao/LanguageDAO.java

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

common/src/main/java/com/jpsoft/order/modules/sys/entity/Language.java

@@ -0,0 +1,41 @@
+package com.jpsoft.order.modules.sys.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;
+
+/**
+  描述:sys_language的实体类
+ */
+@Data
+@ApiModel(value = "sys_language的实体类")
+public class Language {
+        @ApiModelProperty(value = "编号")
+    private String id;
+        @ApiModelProperty(value = "名称")
+    private String name;
+        @ApiModelProperty(value = "中文")
+    private String chinese;
+        @ApiModelProperty(value = "英文")
+    private String english;
+        @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;
+}

common/src/main/java/com/jpsoft/order/modules/sys/service/LanguageService.java

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

common/src/main/java/com/jpsoft/order/modules/sys/service/impl/LanguageServiceImpl.java

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

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

@@ -0,0 +1,151 @@
+<?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.order.modules.base.dao.OrderFormDAO">
+	<resultMap id="OrderFormMap" type="com.jpsoft.order.modules.base.entity.OrderForm">
+		<id property="id" column="id_" />
+			<result property="clientEmail" column="client_email" />
+			<result property="clientName" column="client_name" />
+			<result property="clientOrderNumber" column="client_order_number" />
+			<result property="feilihuaOrderNumber" column="feilihua_order_number" />
+			<result property="productName" column="product_name" />
+			<result property="trademark" column="trademark_" />
+			<result property="productSpecification" column="product_specification" />
+			<result property="orderQuantity" column="order_quantity" />
+			<result property="unit" column="unit_" />
+			<result property="requiredDeliveryTime" column="required_delivery_time" />
+			<result property="reviewDeliveryTime" column="review_delivery_time" />
+			<result property="stockQuantity" column="stock_quantity" />
+			<result property="productionQuantity" column="production_quantity" />
+			<result property="expiryTime" column="expiry_time" />
+			<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.order.modules.base.entity.OrderForm">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_order_form
+	    (id_,client_email,client_name,client_order_number,feilihua_order_number,product_name,trademark_,product_specification,order_quantity,unit_,required_delivery_time,review_delivery_time,stock_quantity,production_quantity,expiry_time,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{clientEmail,jdbcType=VARCHAR}
+,#{clientName,jdbcType=VARCHAR}
+,#{clientOrderNumber,jdbcType=VARCHAR}
+,#{feilihuaOrderNumber,jdbcType=VARCHAR}
+,#{productName,jdbcType=VARCHAR}
+,#{trademark,jdbcType=VARCHAR}
+,#{productSpecification,jdbcType=VARCHAR}
+,#{orderQuantity,jdbcType= NUMERIC }
+,#{unit,jdbcType=VARCHAR}
+,#{requiredDeliveryTime,jdbcType= TIMESTAMP }
+,#{reviewDeliveryTime,jdbcType= TIMESTAMP }
+,#{stockQuantity,jdbcType= NUMERIC }
+,#{productionQuantity,jdbcType= NUMERIC }
+,#{expiryTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_order_form where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.order.modules.base.entity.OrderForm">
+		update base_order_form
+		<set>
+				<if test="clientEmail!=null">
+		client_email=#{clientEmail,jdbcType=VARCHAR},
+		</if>
+				<if test="clientName!=null">
+		client_name=#{clientName,jdbcType=VARCHAR},
+		</if>
+				<if test="clientOrderNumber!=null">
+		client_order_number=#{clientOrderNumber,jdbcType=VARCHAR},
+		</if>
+				<if test="feilihuaOrderNumber!=null">
+		feilihua_order_number=#{feilihuaOrderNumber,jdbcType=VARCHAR},
+		</if>
+				<if test="productName!=null">
+		product_name=#{productName,jdbcType=VARCHAR},
+		</if>
+				<if test="trademark!=null">
+		trademark_=#{trademark,jdbcType=VARCHAR},
+		</if>
+				<if test="productSpecification!=null">
+		product_specification=#{productSpecification,jdbcType=VARCHAR},
+		</if>
+				<if test="orderQuantity!=null">
+		order_quantity=#{orderQuantity,jdbcType= NUMERIC },
+		</if>
+				<if test="unit!=null">
+		unit_=#{unit,jdbcType=VARCHAR},
+		</if>
+				<if test="requiredDeliveryTime!=null">
+		required_delivery_time=#{requiredDeliveryTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="reviewDeliveryTime!=null">
+		review_delivery_time=#{reviewDeliveryTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="stockQuantity!=null">
+		stock_quantity=#{stockQuantity,jdbcType= NUMERIC },
+		</if>
+				<if test="productionQuantity!=null">
+		production_quantity=#{productionQuantity,jdbcType= NUMERIC },
+		</if>
+				<if test="expiryTime!=null">
+		expiry_time=#{expiryTime,jdbcType= TIMESTAMP },
+		</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="OrderFormMap">
+		select 
+id_,client_email,client_name,client_order_number,feilihua_order_number,product_name,trademark_,product_specification,order_quantity,unit_,required_delivery_time,review_delivery_time,stock_quantity,production_quantity,expiry_time,del_flag,create_by,create_time,update_by,update_time		from base_order_form where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_order_form where id_=#{0}
+	</select>
+	<select id="list" resultMap="OrderFormMap">
+		select * from base_order_form
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="OrderFormMap">
+		<![CDATA[
+			select * from base_order_form
+		]]>
+		<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>

common/src/main/resources/mapper/sys/Language.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.order.modules.sys.dao.LanguageDAO">
+	<resultMap id="LanguageMap" type="com.jpsoft.order.modules.sys.entity.Language">
+		<id property="id" column="id_" />
+		<result property="name" column="name_" />
+		<result property="chinese" column="chinese_" />
+		<result property="english" column="english_" />
+		<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.order.modules.sys.entity.Language">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into sys_language
+	    (id_,name_,chinese_,english_,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{chinese,jdbcType=VARCHAR}
+,#{english,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 sys_language where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.order.modules.sys.entity.Language">
+		update sys_language
+		<set>
+			<if test="name!=null">
+				name_=#{name,jdbcType=VARCHAR},
+			</if>
+				<if test="chinese!=null">
+		chinese_=#{chinese,jdbcType=VARCHAR},
+		</if>
+				<if test="english!=null">
+		english_=#{english,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="LanguageMap">
+		select 
+id_,name_,chinese_,english_,del_flag,create_by,create_time,update_by,update_time		from sys_language where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from sys_language where id_=#{0}
+	</select>
+	<select id="list" resultMap="LanguageMap">
+		select * from sys_language
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="LanguageMap">
+		<![CDATA[
+			select * from sys_language
+		]]>
+		<where>
+			del_flag=0
+			<if test="searchParams.name != null">
+				and name_ like #{searchParams.name}
+			</if>
+			<if test="searchParams.chinese != null">
+				and chinese_ like #{searchParams.chinese}
+			</if>
+			<if test="searchParams.english != null">
+				and english_ like #{searchParams.english}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

web/src/main/java/com/jpsoft/order/modules/base/controller/OrderFormController.java

@@ -0,0 +1,329 @@
+package com.jpsoft.order.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.order.config.OSSConfig;
+import com.jpsoft.order.modules.common.utils.OSSUtil;
+import com.jpsoft.order.modules.common.utils.POIUtils;
+import com.jpsoft.order.modules.common.utils.PojoUtils;
+import com.jpsoft.order.modules.common.dto.Sort;
+import com.jpsoft.order.modules.common.dto.MessageResult;
+import com.jpsoft.order.modules.base.entity.OrderForm;
+import com.jpsoft.order.modules.base.service.OrderFormService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/orderForm")
+@Api(description = "orderForm")
+public class OrderFormController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private OSSConfig ossConfig;
+    @Autowired
+    private OrderFormService orderFormService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<OrderForm> create(){
+        MessageResult<OrderForm> msgResult = new MessageResult<>();
+
+        OrderForm orderForm = new OrderForm();
+
+        msgResult.setData(orderForm);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<OrderForm> add(@RequestBody OrderForm orderForm,@RequestAttribute String subject){
+        MessageResult<OrderForm> msgResult = new MessageResult<>();
+
+        try {
+            orderForm.setId(UUID.randomUUID().toString());
+            orderForm.setDelFlag(false);
+            orderForm.setCreateBy(subject);
+            orderForm.setCreateTime(new Date());
+            
+            int affectCount = orderFormService.insert(orderForm);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(orderForm);
+            } 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<OrderForm> edit(@PathVariable("id") String id){
+        MessageResult<OrderForm> msgResult = new MessageResult<>();
+
+        try {
+            OrderForm orderForm = orderFormService.get(id);
+
+            if (orderForm != null) {
+                msgResult.setResult(true);
+                msgResult.setData(orderForm);
+            } 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<OrderForm> update(@RequestBody OrderForm orderForm,@RequestAttribute String subject){
+        MessageResult<OrderForm> msgResult = new MessageResult<>();
+
+        try {
+            orderForm.setUpdateBy(subject);
+            orderForm.setUpdateTime(new Date());
+            
+            int affectCount = orderFormService.update(orderForm);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(orderForm);
+            } 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 {
+            OrderForm orderForm = orderFormService.get(id);
+            orderForm.setDelFlag(true);
+            orderForm.setUpdateBy(subject);
+            orderForm.setUpdateTime(new Date());
+
+            int affectCount = orderFormService.update(orderForm);
+
+            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) {
+                OrderForm orderForm = orderFormService.get(id);
+                orderForm.setDelFlag(true);
+                orderForm.setUpdateBy(subject);
+                orderForm.setUpdateTime(new Date());
+
+                affectCount += orderFormService.update(orderForm);
+            }
+
+            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<OrderForm> page = orderFormService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="导入订单")
+    @PostMapping("importXls")
+    public MessageResult<String> importXls(MultipartFile uploadFile, @RequestAttribute String subject){
+        MessageResult<String> msgResult = new MessageResult<>();
+
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            POIUtils poiUtils = new POIUtils(uploadFile.getInputStream());
+            Sheet sheet1 = poiUtils.getSheetAt(0);
+
+            int affectCount = 0;
+            int failCount = 0;
+            int validateColIndex = 14;
+
+            for(int rowIndex=1; rowIndex<=sheet1.getLastRowNum(); rowIndex++){
+                try {
+                    String strBatch = poiUtils.getCellValue(0,rowIndex,0).toString();
+                    String strSerialNo = poiUtils.getCellValue(0,rowIndex,1).toString();
+                    String strComplainant = poiUtils.getCellValue(0,rowIndex,2).toString();
+                    String strComplainantPhone = poiUtils.getCellValue(0,rowIndex,3).toString();
+                    String strProblem = poiUtils.getCellValue(0,rowIndex,4).toString();
+                    String strArea = poiUtils.getCellValue(0,rowIndex,5).toString();
+                    String strSpecialClass = poiUtils.getCellValue(0,rowIndex,6).toString();
+                    String strSuggestedDate = poiUtils.getCellValue(0,rowIndex,7).toString();
+                    String strOrg = poiUtils.getCellValue(0,rowIndex,8).toString();
+                    String strWarnDate1 = poiUtils.getCellValue(0,rowIndex,9).toString();
+                    String strWarnDate2 = poiUtils.getCellValue(0,rowIndex,10).toString();
+                    String strWarnDate3 = poiUtils.getCellValue(0,rowIndex,11).toString();
+                    String strAllotedDate = poiUtils.getCellValue(0,rowIndex,12).toString();
+                    String strRemark = poiUtils.getCellValue(0,rowIndex,13).toString();
+
+                    //案件信息
+//                    Incident incident = new Incident();
+//                    incident.setId(UUID.randomUUID().toString());
+
+//                    if(StringUtils.isNotEmpty(strSuggestedDate)){
+//                        incident.setSuggestedDate(sdf.parse(strSuggestedDate));
+//                    }
+//                    else{
+//                        sheet1.getRow(rowIndex).createCell(validateColIndex).setCellValue("请填写建议办结时限!");
+//                        failCount++;
+//                        continue;
+//                    }
+
+//                    incidentService.insert(incident);
+
+                    affectCount++;
+                }
+                catch(Exception innerEx){
+                    logger.error(innerEx.getMessage(),innerEx);
+                    failCount++;
+                }
+            }
+
+            if (failCount>0){
+                //有导入失败的记录
+                msgResult.setResult(false);
+                msgResult.setMessage("数据成功导入" + affectCount + "条,有" + failCount + "条数据未导入成功，错误原因请查看报表。");
+
+                //todo 只保留错误数据的sheet
+                Workbook wb = poiUtils.exportErrorXls(0,validateColIndex,1 + affectCount + failCount);
+
+                //todo 将wb保存到oss
+                ByteArrayOutputStream output = new ByteArrayOutputStream();
+                wb.write(output);
+
+                byte[] buffer = output.toByteArray();
+                ByteArrayInputStream input = new ByteArrayInputStream(buffer);
+
+                //格式化holidayInfo
+                SimpleDateFormat sim = new SimpleDateFormat("yyyyMMddHHmmss");
+                String fileName = "error" + sim.format(new Date()) + ".xls";
+                String downloadUrl = OSSUtil.upload(ossConfig,"excellent",fileName,input);
+
+                //todo 返回导入失败报表下载链接
+                msgResult.setData(downloadUrl);
+            }
+            else{
+                msgResult.setResult(true);
+                msgResult.setMessage("数据成功导入" + affectCount + "条");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/order/modules/sys/controller/LanguageController.java

@@ -0,0 +1,231 @@
+package com.jpsoft.order.modules.sys.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.order.modules.common.utils.PojoUtils;
+import com.jpsoft.order.modules.common.dto.Sort;
+import com.jpsoft.order.modules.common.dto.MessageResult;
+import com.jpsoft.order.modules.sys.entity.Language;
+import com.jpsoft.order.modules.sys.service.LanguageService;
+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("/sys/language")
+@Api(description = "language")
+public class LanguageController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private LanguageService languageService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<Language> create(){
+        MessageResult<Language> msgResult = new MessageResult<>();
+
+        Language language = new Language();
+
+        msgResult.setData(language);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<Language> add(@RequestBody Language language,@RequestAttribute String subject){
+        MessageResult<Language> msgResult = new MessageResult<>();
+
+        try {
+            language.setId(UUID.randomUUID().toString());
+            language.setDelFlag(false);
+            language.setCreateBy(subject);
+            language.setCreateTime(new Date());
+            
+            int affectCount = languageService.insert(language);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(language);
+            } 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<Language> edit(@PathVariable("id") String id){
+        MessageResult<Language> msgResult = new MessageResult<>();
+
+        try {
+            Language language = languageService.get(id);
+
+            if (language != null) {
+                msgResult.setResult(true);
+                msgResult.setData(language);
+            } 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<Language> update(@RequestBody Language language,@RequestAttribute String subject){
+        MessageResult<Language> msgResult = new MessageResult<>();
+
+        try {
+            language.setUpdateBy(subject);
+            language.setUpdateTime(new Date());
+            
+            int affectCount = languageService.update(language);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(language);
+            } 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 {
+            Language language = languageService.get(id);
+            language.setDelFlag(true);
+            language.setUpdateBy(subject);
+            language.setUpdateTime(new Date());
+
+            int affectCount = languageService.update(language);
+
+            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) {
+                Language language = languageService.get(id);
+                language.setDelFlag(true);
+                language.setUpdateBy(subject);
+                language.setUpdateTime(new Date());
+
+                affectCount += languageService.update(language);
+            }
+
+            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 name, String chinese, String english,
+            @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("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(name)) {
+            searchParams.put("name","%" + name + "%");
+        }
+        if (StringUtils.isNotEmpty(chinese)) {
+            searchParams.put("chinese","%" + chinese + "%");
+        }
+        if (StringUtils.isNotEmpty(english)) {
+            searchParams.put("english","%" + english + "%");
+        }
+
+        Page<Language> page = languageService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ spring:
 
 logger:
   level: WARN
-  dir: D:\Logs\excellent-server
+  dir: D:\Logs\order-server
 
 electricity:
   port: 9966    #监听端口