dcs 2 ヶ月 前
コミット
b401c39e45

+ 1 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/workark/controller/ProductLevelController.java

@@ -35,7 +35,7 @@ public class ProductLevelController {
     }
 
     @ApiOperation(value = "获取列表", notes = "获取列表")
-    @RequestMapping(value = "", method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
     public Response getList() {
         return Response.ok(productLevelService.getRoot());
     }

+ 27 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/Product.java

@@ -74,6 +74,16 @@ public class Product {
      */
     private String detailedImage;
 
+    /**
+     * 合同
+     */
+    private String  contract;
+
+    /**
+     * 副标题
+     */
+    private String subtitle;
+
     public Long getId() {
         return id;
     }
@@ -177,4 +187,21 @@ public class Product {
     public void setDetailedImage(String detailedImage) {
         this.detailedImage = detailedImage;
     }
+
+    public String getContract() {
+        return contract;
+    }
+
+    public void setContract(String contract) {
+        this.contract = contract;
+    }
+
+    public String getSubtitle() {
+        return subtitle;
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle = subtitle;
+    }
+
 }

+ 6 - 2
virgo.api/src/main/resources/mapper/ProductMapper.xml

@@ -18,6 +18,8 @@
         <result column="listDisplayImage" property="listDisplayImage"/>
         <result column="rotatingImages" property="rotatingImages"/>
         <result column="detailedImage" property="detailedImage"/>
+        <result column="contract" property="contract"/>
+        <result column="subtitle" property="subtitle"/>
     </resultMap>
 
     <select id="get" resultMap="result">
@@ -92,8 +94,8 @@
     </select>
 
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO workark_product (organizationId, type, productLevelId, createTime, name, price, intro, listDisplayImage, rotatingImages, detailedImage)
-        VALUES (#{organizationId}, #{type}, #{productLevelId}, now(), #{name}, #{price}, #{intro}, #{listDisplayImage}, #{rotatingImages}, #{detailedImage})
+        INSERT INTO workark_product (organizationId, type, productLevelId, createTime, name, price, intro, listDisplayImage, rotatingImages, detailedImage, contract, subtitle)
+        VALUES (#{organizationId}, #{type}, #{productLevelId}, now(), #{name}, #{price}, #{intro}, #{listDisplayImage}, #{rotatingImages}, #{detailedImage}, #{contract}, #{subtitle})
     </insert>
 
     <update id="update" parameterType="com.bosshand.virgo.api.workark.model.Product">
@@ -110,6 +112,8 @@
             <if test="listDisplayImage!=null">listDisplayImage=#{listDisplayImage},</if>
             <if test="rotatingImages!=null">rotatingImages=#{rotatingImages},</if>
             <if test="detailedImage!=null">detailedImage=#{detailedImage},</if>
+            <if test="contract!=null">contract=#{contract},</if>
+            <if test="subtitle!=null">subtitle=#{subtitle},</if>
         </trim>
         WHERE id=#{id}
     </update>

+ 2 - 0
virgo.core/src/main/java/com/bosshand/virgo/core/config/ShiroConfig.java

@@ -61,8 +61,10 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/configuration/**","anon");
 
 
+		filterChainDefinitionMap.put("/workarkProductLevel/list", "anon");
 		filterChainDefinitionMap.put("/workarkProductLevel/getParentId/**", "anon");
 		filterChainDefinitionMap.put("/workarkProduct/details/**", "anon");
+		filterChainDefinitionMap.put("/workarkProduct/query/**", "anon");
 		filterChainDefinitionMap.put("/client/downloadModel", "anon");
 		filterChainDefinitionMap.put("/client/listByDate/**", "anon");
 		filterChainDefinitionMap.put("/test/downloadModel", "anon");