'增加表单功能'

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>[table-name]</param><!--运力-->
+                        <param>form_data</param><!--运力-->
                     </tables>
                 </configuration>
                 <executions>
@@ -149,4 +149,4 @@
             </resource>
         </resources>
     </build>
-</project>
+</project>

src/main/java/com/steerinfo/dil/controller/ColumnDataController.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * @Date 2021/6/17 8:31
  * @Version 1.0
  */
-@RequestMapping("/${api.version}/columnDate")
+@RequestMapping("/${api.version}/columnData")
 @io.swagger.annotations.Api(tags = "表头api接口")
 @RestController
 public class ColumnDataController extends BaseRESTfulController {
@@ -52,8 +52,8 @@ public class ColumnDataController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="新增columnDate")
-    @PostMapping("insert/columnDate")
+    @ApiOperation(value="新增columnData")
+    @PostMapping("insert/columnData")
     @Transactional
     public RESTfulResult insertColumnData(@RequestBody(required=false) Map<String,List<ColumnData>> columnDatas){
         BigDecimal apiId = columnDataService.getApiId();
@@ -72,8 +72,8 @@ public class ColumnDataController extends BaseRESTfulController {
         return success(columnDataMap.get(0).getApiId());
     }
 
-    @ApiOperation(value="修改columnDate")
-    @PostMapping("update/columnDate")
+    @ApiOperation(value="修改columnData")
+    @PostMapping("update/columnData")
     @Transactional
     public RESTfulResult updateColumnData(@RequestBody(required=false) Map<String,List<ColumnData>> Datas,
                                           BigDecimal apiId){

src/main/java/com/steerinfo/dil/controller/FormDataController.java

@@ -0,0 +1,50 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.FormData;
+import com.steerinfo.dil.service.IFormDataService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/7/6 9:14
+ * @Version 1.0
+ */
+
+@RestController
+@RequestMapping("/${api.version}/fromData")
+public class FormDataController extends BaseRESTfulController {
+
+    @Autowired
+    IFormDataService formDataService;
+
+    @ApiOperation(value="查询formData")
+    @GetMapping("/{formDataId}")
+    public RESTfulResult getFormData(@PathVariable("formDataId") Integer formDataId){
+        return success(formDataService.getFormData(formDataId));
+    }
+
+    @ApiOperation(value="新增formData")
+    @PostMapping("/insert")
+    @Transactional
+    public RESTfulResult insert(@RequestBody FormData formData){
+        BigDecimal formDataId = formDataService.getFormDataId();
+        formData.setFormDataId(formDataId);
+        formDataService.insertFormData(formData);
+        return success(formDataId);
+    }
+
+    @ApiOperation(value="修改formData")
+    @PostMapping("/update")
+    @Transactional
+    public RESTfulResult update(@RequestBody FormData formData){
+        formDataService.updateFormData(formData);
+        return success();
+    }
+}

src/main/java/com/steerinfo/dil/mapper/FormDataMapper.java

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.FormData;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+@Mapper
+public interface FormDataMapper extends IBaseMapper<FormData, BigDecimal> {
+    Map<String, Object> selectFormData(Integer formDataId);
+(数量*(单价*(1+(((能源基本价格-能源调整价格)/能源基本价格)*100-100))*rate))+extra
+    BigDecimal selectFormDataId();
+}

src/main/java/com/steerinfo/dil/model/FormData.java

@@ -0,0 +1,78 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+@ApiModel(value="表单数据")
+public class FormData implements IBasePO<BigDecimal> {
+    /**
+     * 表单id(FORM_DATA_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="表单id",required=true)
+    private BigDecimal formDataId;
+
+    /**
+     * 表单名称(FORM_DATA_NAME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="表单名称",required=false)
+    private String formDataName;
+
+    /**
+     * json数据(FORM_DATA_JSON,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="json数据",required=false)
+    private String formDataJson;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.formDataId;
+    }
+
+    @Override
+    public void setId(BigDecimal formDataId) {
+        this.formDataId = formDataId;
+    }
+
+    public BigDecimal getFormDataId() {
+        return formDataId;
+    }
+
+    public void setFormDataId(BigDecimal formDataId) {
+        this.formDataId = formDataId;
+    }
+
+    public String getFormDataName() {
+        return formDataName;
+    }
+
+    public void setFormDataName(String formDataName) {
+        this.formDataName = formDataName == null ? null : formDataName.trim();
+    }
+
+    public String getFormDataJson() {
+        return formDataJson;
+    }
+
+    public void setFormDataJson(String formDataJson) {
+        this.formDataJson = formDataJson == null ? null : formDataJson.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", formDataId=").append(formDataId);
+        sb.append(", formDataName=").append(formDataName);
+        sb.append(", formDataJson=").append(formDataJson);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/service/IFormDataService.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.FormData;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/7/6 9:43
+ * @Version 1.0
+ */
+public interface IFormDataService {
+    Map<String,Object> getFormData(Integer formDataId);
+
+    int insertFormData(FormData formData);
+
+    BigDecimal getFormDataId();
+
+    int updateFormData(FormData formData);
+}

src/main/java/com/steerinfo/dil/service/impl/FormDataService.java

@@ -0,0 +1,44 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.FormDataMapper;
+import com.steerinfo.dil.model.FormData;
+import com.steerinfo.dil.service.IFormDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/7/6 9:43
+ * @Version 1.0
+ */
+@Service
+public class FormDataService implements IFormDataService {
+
+    @Autowired
+    FormDataMapper formDataMapper;
+
+    @Override
+    public Map<String, Object> getFormData(Integer formDataId) {
+        return formDataMapper.selectFormData(formDataId);
+    }
+
+    @Override
+    public int insertFormData(FormData formData) {
+        return formDataMapper.insert(formData);
+    }
+
+    @Override
+    public BigDecimal getFormDataId() {
+        BigDecimal id = formDataMapper.selectFormDataId();
+        return id ==null?new BigDecimal(1):id;
+    }
+
+    @Override
+    public int updateFormData(FormData formData) {
+        return formDataMapper.updateByPrimaryKeySelective(formData);
+    }
+}

src/main/resources/bootstrap.yml

@@ -18,7 +18,7 @@ eureka:
     service-url:
       defaultZone: http://root:root@discovery.steerinfo.com/eureka/
   instance:
-    prefer-ip-address: true
+#    prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
 
 genxml:
@@ -50,4 +50,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8083
+  port: 8083

src/main/resources/com/steerinfo/dil/mapper/FormDataMapper.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.FormDataMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.FormData">
+    <id column="FORM_DATA_ID" jdbcType="DECIMAL" property="formDataId" />
+    <result column="FORM_DATA_NAME" jdbcType="VARCHAR" property="formDataName" />
+    <result column="FORM_DATA_JSON" jdbcType="VARCHAR" property="formDataJson" />
+  </resultMap>
+  <sql id="columns">
+    FORM_DATA_ID, FORM_DATA_NAME, FORM_DATA_JSON
+  </sql>
+  <sql id="columns_alias">
+    t.FORM_DATA_ID, t.FORM_DATA_NAME, t.FORM_DATA_JSON
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM FORM_DATA
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM FORM_DATA t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="formDataId != null">
+        and FORM_DATA_ID = #{formDataId}
+      </if>
+      <if test="formDataName != null and formDataName != ''">
+        and FORM_DATA_NAME = #{formDataName}
+      </if>
+      <if test="formDataJson != null and formDataJson != ''">
+        and FORM_DATA_JSON = #{formDataJson}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="formDataId != null">
+        and FORM_DATA_ID = #{formDataId}
+      </if>
+      <if test="formDataName != null and formDataName != ''">
+        and FORM_DATA_NAME LIKE '%${formDataName}%'
+      </if>
+      <if test="formDataJson != null and formDataJson != ''">
+        and FORM_DATA_JSON LIKE '%${formDataJson}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from FORM_DATA
+    where FORM_DATA_ID = #{formDataId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from FORM_DATA
+    where 1!=1
+      <if test="formDataName != null and formDataName != ''">
+        or FORM_DATA_NAME = #{formDataName}
+      </if>
+      <if test="formDataJson != null and formDataJson != ''">
+        or FORM_DATA_JSON = #{formDataJson}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.FormData">
+    insert into FORM_DATA (FORM_DATA_ID, FORM_DATA_NAME, FORM_DATA_JSON
+      )
+    values (#{formDataId,jdbcType=DECIMAL}, #{formDataName,jdbcType=VARCHAR}, #{formDataJson,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.FormData">
+    insert into FORM_DATA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="formDataId != null">
+        FORM_DATA_ID,
+      </if>
+      <if test="formDataName != null">
+        FORM_DATA_NAME,
+      </if>
+      <if test="formDataJson != null">
+        FORM_DATA_JSON,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="formDataId != null">
+        #{formDataId,jdbcType=DECIMAL},
+      </if>
+      <if test="formDataName != null">
+        #{formDataName,jdbcType=VARCHAR},
+      </if>
+      <if test="formDataJson != null">
+        #{formDataJson,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.FormData">
+    update FORM_DATA
+    set FORM_DATA_NAME = #{formDataName,jdbcType=VARCHAR},
+      FORM_DATA_JSON = #{formDataJson,jdbcType=VARCHAR}
+    where FORM_DATA_ID = #{formDataId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.FormData">
+    update FORM_DATA
+    <set>
+      <if test="formDataName != null">
+        FORM_DATA_NAME = #{formDataName,jdbcType=VARCHAR},
+      </if>
+      <if test="formDataJson != null">
+        FORM_DATA_JSON = #{formDataJson,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where FORM_DATA_ID = #{formDataId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where FORM_DATA_ID = #{formDataId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into FORM_DATA
+      (FORM_DATA_ID,
+      FORM_DATA_NAME, FORM_DATA_JSON)
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.formDataId,jdbcType=DECIMAL},
+      #{item.formDataName,jdbcType=VARCHAR}, #{item.formDataJson,jdbcType=VARCHAR} from dual
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update FORM_DATA
+     set
+       FORM_DATA_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FORM_DATA_ID" close="end">
+          when #{item.formDataId,jdbcType=DECIMAL} then #{item.formDataId,jdbcType=DECIMAL}
+       </foreach>
+       ,FORM_DATA_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FORM_DATA_ID" close="end">
+          when #{item.formDataId,jdbcType=DECIMAL} then #{item.formDataName,jdbcType=VARCHAR}
+       </foreach>
+       ,FORM_DATA_JSON=
+       <foreach collection="list" item="item" index="index" separator=" " open="case FORM_DATA_ID" close="end">
+          when #{item.formDataId,jdbcType=DECIMAL} then #{item.formDataJson,jdbcType=VARCHAR}
+       </foreach>
+     where FORM_DATA_ID in
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.formDataId,jdbcType=DECIMAL}
+     </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from FORM_DATA
+    where FORM_DATA_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectFormData" resultType="java.util.Map">
+    select
+    fd.form_data_id "form_data_id",
+    fd.form_data_name "form_data_name",
+    fd.form_data_json "form_data_json"
+    from
+    FORM_DATA fd
+    where fd.form_data_id=#{formDataId}
+  </select>
+  <select id="selectFormDataId" resultType="java.math.BigDecimal">
+    select
+    max(fd.form_data_id)+1
+    from
+    FORM_DATA fd
+  </select>
+
+</mapper>