合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
@@ -47,10 +48,37 @@ public class TicketController {
         response = iTicketService.getList(tpTicket,pageNum,pageSize);
         return response;
     }
-
+    
     public ResponseBean getTicketSchedule(){
         ResponseBean responseBean = new ResponseBean();
         return responseBean;
     }
     
+    @RequestMapping(value = "/tickets/list/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
+    })
+    public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
+                                       @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "type") String type,
+                                       HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setCommunityId(Integer.valueOf(communityId));
+        tpTicket.setTaUserId(userElement.getId());
+        tpTicket.setType(type);
+
+        responseBean = iTicketService.getByTypeList(tpTicket,pageNum,pageSize);
+
+        return responseBean;
+
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -32,7 +32,7 @@ public class UserController {
     @Autowired
     private ITaUserService iTaUserService;
 
-    @ApiOperation(value = "登录", notes = "根据登录名和密码")
+    @ApiOperation(value = "登录", notes = "根据登录名和验证码")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "登陆名(手机号)"),

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java

@@ -4,6 +4,7 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpActivitySignup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 @Mapper
 public interface TpActivitySignupMapper {
     int deleteByPrimaryKey(Integer id);

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -1,6 +1,5 @@
 package com.community.huiju.model;
 
-
 import java.util.Date;
 
 public class TaUser {
@@ -149,7 +148,7 @@ public class TaUser {
     }
 
     public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus;
+        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
     }
 
     public Integer getCreateUser() {

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTicket.java

@@ -19,16 +19,6 @@ public class TpTicket {
 
     private String repairType;
 
-    private String ticketMatchImg1;
-
-    private String ticketMatchImg2;
-
-    private String ticketMatchImg3;
-
-    private String ticketMatchImg4;
-
-    private String ticketMatchImg5;
-
     private Integer tpUserId;
 
     private String score;
@@ -107,46 +97,6 @@ public class TpTicket {
         this.repairType = repairType == null ? null : repairType.trim();
     }
 
-    public String getTicketMatchImg1() {
-        return ticketMatchImg1;
-    }
-
-    public void setTicketMatchImg1(String ticketMatchImg1) {
-        this.ticketMatchImg1 = ticketMatchImg1 == null ? null : ticketMatchImg1.trim();
-    }
-
-    public String getTicketMatchImg2() {
-        return ticketMatchImg2;
-    }
-
-    public void setTicketMatchImg2(String ticketMatchImg2) {
-        this.ticketMatchImg2 = ticketMatchImg2 == null ? null : ticketMatchImg2.trim();
-    }
-
-    public String getTicketMatchImg3() {
-        return ticketMatchImg3;
-    }
-
-    public void setTicketMatchImg3(String ticketMatchImg3) {
-        this.ticketMatchImg3 = ticketMatchImg3 == null ? null : ticketMatchImg3.trim();
-    }
-
-    public String getTicketMatchImg4() {
-        return ticketMatchImg4;
-    }
-
-    public void setTicketMatchImg4(String ticketMatchImg4) {
-        this.ticketMatchImg4 = ticketMatchImg4 == null ? null : ticketMatchImg4.trim();
-    }
-
-    public String getTicketMatchImg5() {
-        return ticketMatchImg5;
-    }
-
-    public void setTicketMatchImg5(String ticketMatchImg5) {
-        this.ticketMatchImg5 = ticketMatchImg5 == null ? null : ticketMatchImg5.trim();
-    }
-
     public Integer getTpUserId() {
         return tpUserId;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java

@@ -17,9 +17,18 @@ public interface ITicketService {
      * @param tpTicket
      * @param pageCode
      * @param pageSize
-     * @return
+     * @return 返回 维修/投诉/联系单 各 pageSize 条
      */
     ResponseBean getList(TpTicket tpTicket,Integer pageCode, Integer pageSize);
 
+    /**
+     * 根据 小区ID 用户ID 类型 查询数据
+     * @param tpTicket
+     * @param pageNum
+     * @param pageSize
+     * @return 返回 维修/投诉/联系单 记录列表
+     */
+    ResponseBean getByTypeList(TpTicket tpTicket,Integer pageNum, Integer pageSize);
+
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -42,10 +42,9 @@ public class TicketServiceImpl implements ITicketService {
         Map<String,Object> parameter = Maps.newHashMap();
         parameter.put("communityId",tpTicket.getCommunityId());
         parameter.put("taUserId",tpTicket.getTaUserId());
+
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type",0);
-
-
         // 报修
         PageHelper.startPage(pageNum,pageSize);
         List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
@@ -116,4 +115,26 @@ public class TicketServiceImpl implements ITicketService {
         });
     }
 
+    @Override
+    public ResponseBean getByTypeList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
+
+        ResponseBean response = new ResponseBean();
+
+        Map<String,Object> parameter = Maps.newHashMap();
+        parameter.put("communityId",tpTicket.getCommunityId());
+        parameter.put("taUserId",tpTicket.getTaUserId());
+
+        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        parameter.put("type",tpTicket.getType());
+
+        PageHelper.startPage(pageNum,pageSize);
+        List<TpTicket> tpTicketList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
+
+        List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
+        tpTicketVOConvert(tpTicketList,tpTicketVOList);
+
+        response.addSuccess(tpTicketVOList);
+
+        return response;
+    }
 }

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

@@ -8,7 +8,7 @@
     <result column="head_portrait" property="headPortrait" jdbcType="VARCHAR" />
     <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="login_name" property="loginName" jdbcType="VARCHAR" />
-    <!--<result column="login_password" property="loginPassword" jdbcType="VARCHAR" />-->
+    <result column="login_password" property="loginPassword" jdbcType="VARCHAR" />
     <result column="email" property="email" jdbcType="VARCHAR" />
     <result column="gender" property="gender" jdbcType="CHAR" />
     <result column="status" property="status" jdbcType="CHAR" />
@@ -23,11 +23,11 @@
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password, 
-    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,create_user, create_date,
-    update_user, update_date
+    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
+    create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from ta_user
     where id = #{id,jdbcType=INTEGER}
@@ -37,18 +37,20 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TaUser" >
-    insert into ta_user (id, community_id, building_owner_info_id, 
-      head_portrait, user_name, login_name, 
-      login_password, email, gender, 
-      status, remark, parent_id, 
-      accept_agreement_status, verify_status, create_user, create_date,
-      update_user, update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER}, 
-      #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
-      #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, 
-      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, 
-      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR},#{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
-      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+    insert into ta_user (id, community_id, building_owner_info_id,
+      head_portrait, user_name, login_name,
+      login_password, email, gender,
+      status, remark, parent_id,
+      accept_agreement_status, verify_status, create_user,
+      create_date, update_user, update_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
+      #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
+      #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
+      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
+      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" >
     insert into ta_user
@@ -92,7 +94,7 @@
       <if test="acceptAgreementStatus != null" >
         accept_agreement_status,
       </if>
-      <if test="verifyStatus != null">
+      <if test="verifyStatus != null" >
         verify_status,
       </if>
       <if test="createUser != null" >
@@ -148,7 +150,7 @@
       <if test="acceptAgreementStatus != null" >
         #{acceptAgreementStatus,jdbcType=CHAR},
       </if>
-      <if test="verifyStatus != null">
+      <if test="verifyStatus != null" >
         #{verifyStatus,jdbcType=CHAR},
       </if>
       <if test="createUser != null" >
@@ -204,7 +206,7 @@
       <if test="acceptAgreementStatus != null" >
         accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
       </if>
-      <if test="verifyStatus != null">
+      <if test="verifyStatus != null" >
         verify_status = #{verifyStatus,jdbcType=CHAR},
       </if>
       <if test="createUser != null" >
@@ -248,14 +250,13 @@
     select
     <include refid="Base_Column_List" />
     from ta_user
-    where login_name=#{loginName} and login_password = #{loginPassword}
+    where login_name=#{loginName,jdbcType=VARCHAR} and login_password = #{loginPassword,jdbcType=VARCHAR}
   </select>
 
   <select id="selectByLoginName" parameterType="map" resultMap="BaseResultMap" >
     select
     <include refid="Base_Column_List" />
     from ta_user
-    where login_name=#{loginName}
+    where login_name=#{loginName,jdbcType=VARCHAR}
   </select>
-
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml

@@ -10,11 +10,6 @@
     <result column="status" property="status" jdbcType="CHAR" />
     <result column="type" property="type" jdbcType="CHAR" />
     <result column="repair_type" property="repairType" jdbcType="CHAR" />
-    <result column="ticket_match_img1" property="ticketMatchImg1" jdbcType="VARCHAR" />
-    <result column="ticket_match_img2" property="ticketMatchImg2" jdbcType="VARCHAR" />
-    <result column="ticket_match_img3" property="ticketMatchImg3" jdbcType="VARCHAR" />
-    <result column="ticket_match_img4" property="ticketMatchImg4" jdbcType="VARCHAR" />
-    <result column="ticket_match_img5" property="ticketMatchImg5" jdbcType="VARCHAR" />
     <result column="tp_user_id" property="tpUserId" jdbcType="INTEGER" />
     <result column="score" property="score" jdbcType="VARCHAR" />
     <result column="comment" property="comment" jdbcType="VARCHAR" />
@@ -24,8 +19,7 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ta_user_id, ticket_title, ticket_content, status, type, repair_type, 
-    ticket_match_img1, ticket_match_img2, ticket_match_img3, ticket_match_img4, ticket_match_img5, 
+    id, community_id, ta_user_id, ticket_title, ticket_content, status, type, repair_type,
     tp_user_id, score, comment, create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -41,16 +35,12 @@
   <insert id="insert" parameterType="com.community.huiju.model.TpTicket" >
     insert into tp_ticket (id, community_id, ta_user_id, 
       ticket_title, ticket_content, status, 
-      type, repair_type, ticket_match_img1, 
-      ticket_match_img2, ticket_match_img3, ticket_match_img4, 
-      ticket_match_img5, tp_user_id, score, 
+      type, repair_type, tp_user_id, score,
       comment, create_user, create_date, 
       update_user, update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
       #{ticketTitle,jdbcType=VARCHAR}, #{ticketContent,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, 
-      #{type,jdbcType=CHAR}, #{repairType,jdbcType=CHAR}, #{ticketMatchImg1,jdbcType=VARCHAR}, 
-      #{ticketMatchImg2,jdbcType=VARCHAR}, #{ticketMatchImg3,jdbcType=VARCHAR}, #{ticketMatchImg4,jdbcType=VARCHAR}, 
-      #{ticketMatchImg5,jdbcType=VARCHAR}, #{tpUserId,jdbcType=INTEGER}, #{score,jdbcType=VARCHAR}, 
+      #{type,jdbcType=CHAR}, #{repairType,jdbcType=CHAR}, #{tpUserId,jdbcType=INTEGER}, #{score,jdbcType=VARCHAR},
       #{comment,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
@@ -81,21 +71,6 @@
       <if test="repairType != null" >
         repair_type,
       </if>
-      <if test="ticketMatchImg1 != null" >
-        ticket_match_img1,
-      </if>
-      <if test="ticketMatchImg2 != null" >
-        ticket_match_img2,
-      </if>
-      <if test="ticketMatchImg3 != null" >
-        ticket_match_img3,
-      </if>
-      <if test="ticketMatchImg4 != null" >
-        ticket_match_img4,
-      </if>
-      <if test="ticketMatchImg5 != null" >
-        ticket_match_img5,
-      </if>
       <if test="tpUserId != null" >
         tp_user_id,
       </if>
@@ -143,21 +118,6 @@
       <if test="repairType != null" >
         #{repairType,jdbcType=CHAR},
       </if>
-      <if test="ticketMatchImg1 != null" >
-        #{ticketMatchImg1,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg2 != null" >
-        #{ticketMatchImg2,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg3 != null" >
-        #{ticketMatchImg3,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg4 != null" >
-        #{ticketMatchImg4,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg5 != null" >
-        #{ticketMatchImg5,jdbcType=VARCHAR},
-      </if>
       <if test="tpUserId != null" >
         #{tpUserId,jdbcType=INTEGER},
       </if>
@@ -205,21 +165,6 @@
       <if test="repairType != null" >
         repair_type = #{repairType,jdbcType=CHAR},
       </if>
-      <if test="ticketMatchImg1 != null" >
-        ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg2 != null" >
-        ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg3 != null" >
-        ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg4 != null" >
-        ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
-      </if>
-      <if test="ticketMatchImg5 != null" >
-        ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
-      </if>
       <if test="tpUserId != null" >
         tp_user_id = #{tpUserId,jdbcType=INTEGER},
       </if>
@@ -253,11 +198,6 @@
       status = #{status,jdbcType=CHAR},
       type = #{type,jdbcType=CHAR},
       repair_type = #{repairType,jdbcType=CHAR},
-      ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
-      ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
-      ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
-      ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
-      ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
       tp_user_id = #{tpUserId,jdbcType=INTEGER},
       score = #{score,jdbcType=VARCHAR},
       comment = #{comment,jdbcType=VARCHAR},

CODE/smart-community/app-api/src/test/java/com/community/huiju/DemoApplicationTests.java

@@ -1,16 +1,44 @@
 package com.community.huiju;
 
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.ToCommunitiesMapper;
+import com.community.huiju.dao.TpTicketMapper;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.ToCommunities;
+import com.community.huiju.model.TpTicket;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class DemoApplicationTests {
 
+
+	@Autowired
+	private TaUserMapper mapper;
+
+	@Autowired
+	private TpTicketMapper tpTicketMapper;
+
+	@Autowired
+	private ToCommunitiesMapper toCommunitiesMapper;
+
 	@Test
 	public void contextLoads() {
+
+		List<ToCommunities> list = toCommunitiesMapper.selectByCommunityName("小区");
+		System.out.println(list);
+
+//		TpTicket tpTicket = tpTicketMapper.selectByPrimaryKey(1);
+//		System.out.println(tpTicket);
+
+//		TaUser user = mapper.selectByPrimaryKey(1);
+//		System.out.println(user);
 	}
 
 }