0324.2

ct/src/main/java/com/ccsens/ct/api/SiteController.java

@@ -64,7 +64,7 @@ public class SiteController {
     @RequestMapping(value = "siteAll", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<SiteVo.SiteInfoVo> selectSiteAllByBusinessId(@ApiParam @Validated @RequestBody QueryDto<BusinessDto.BusinessId> params) throws Exception {
         log.info("透过商户id查看所有场所的信息：{}",params);
-        SiteVo.SiteInfoVo siteInfoVo = siteService.selectSiteAllByBusinessId(params);
+        SiteVo.SiteInfoVo siteInfoVo = siteService.selectSiteAllByBusinessId(params.getParam().getId());
         return JsonResponse.newInstance().ok(siteInfoVo);
     }
 

ct/src/main/java/com/ccsens/ct/service/ISiteService.java

@@ -15,7 +15,7 @@ public interface ISiteService {
 
     SiteVo.SiteInfo updateSiteInfo(QueryDto<SiteDto.UpdateSite> params);
 
-    SiteVo.SiteInfoVo selectSiteAllByBusinessId(QueryDto<BusinessDto.BusinessId> params);
+    SiteVo.SiteInfoVo selectSiteAllByBusinessId(Long businessId);
 
     String downloadQrCode(Long businessId);
 }

ct/src/main/java/com/ccsens/ct/service/SiteService.java

@@ -102,15 +102,15 @@ public class SiteService implements ISiteService {
                 outSiteQrcode.setQrcodePath(WebConstant.TEST_URL_BASE_CT +"/business/" + siteInfoDto.getId() + "/siteqrcode/" + site.getSiteName() + "/out/" +  outFileName);
                 outSiteQrcode.setBigQrcodePath(WebConstant.TEST_URL_BASE_CT + "/business/" + siteInfoDto.getId() + "/siteqrcode/" + site.getSiteName() + "/out/" + bigOutFileName);
                 siteQrcodeDao.insertSelective(outSiteQrcode);
-                //获取返回的场所信息
+//                //获取返回的场所信息
-                SiteVo.SiteInfo siteInfo1 = new SiteVo.SiteInfo();
+////                SiteVo.SiteInfo siteInfo1 = new SiteVo.SiteInfo();
-                siteInfo1.setId(site.getId());
+////                siteInfo1.setId(site.getId());
-                siteInfo1.setName(site.getSiteName());
+////                siteInfo1.setName(site.getSiteName());
-                siteInfo1.setLongitude(site.getLongitude());
+////                siteInfo1.setLongitude(site.getLongitude());
-                siteInfo1.setLatitude(site.getLatitude());
+////                siteInfo1.setLatitude(site.getLatitude());
-                siteInfo1.setInQrCode(inSiteQrcode.getQrcodePath());
+////                siteInfo1.setInQrCode(inSiteQrcode.getQrcodePath());
-                siteInfo1.setOutQrCode(outSiteQrcode.getQrcodePath());
+////                siteInfo1.setOutQrCode(outSiteQrcode.getQrcodePath());
-                siteInfos.add(siteInfo1);
+////                siteInfos.add(siteInfo1);
 //            }
 //        }
 
@@ -119,12 +119,14 @@ public class SiteService implements ISiteService {
 
 
         //查找商户信息
-        Business business = businessDao.selectByPrimaryKey(siteInfoDto.getId());
+//        Business business = businessDao.selectByPrimaryKey(siteInfoDto.getId());
-        siteInfoVo.setBusinessId(business.getId());
+//        siteInfoVo.setBusinessId(business.getId());
-        siteInfoVo.setBusinessName(business.getName());
+//        siteInfoVo.setBusinessName(business.getName());
-        siteInfoVo.setSite(siteInfos);
+//        siteInfoVo.setSite(siteInfos);
-        siteInfoVo.setDownloadPath(WebConstant.TEST_URL_BASE_CT + "/business/" + siteInfoDto.getId() + "/QrCode.zip");
+//        siteInfoVo.setDownloadPath(WebConstant.TEST_URL_BASE_CT + "/business/" + siteInfoDto.getId() + "/QrCode.zip");
-        siteInfoVo.setPath("http://test.tall.wiki/ct-dev/sign-history");
+//        siteInfoVo.setPath("http://test.tall.wiki/ct-dev/sign-history");
+
+        siteInfoVo = selectSiteAllByBusinessId(siteInfoDto.getId());
 
         return siteInfoVo;
     }
@@ -205,14 +207,14 @@ public class SiteService implements ISiteService {
     /**
      * 通过商户id查询所有的场所信息
      *
-     * @param params
+     * @param businessId
      * @return
      */
     @Override
-    public SiteVo.SiteInfoVo selectSiteAllByBusinessId(QueryDto<BusinessDto.BusinessId> params) {
+    public SiteVo.SiteInfoVo selectSiteAllByBusinessId(Long businessId) {
         SiteVo.SiteInfoVo siteInfoVo = new SiteVo.SiteInfoVo();
         //获取商户信息
-        Business business = businessDao.selectByPrimaryKey(params.getParam().getId());
+        Business business = businessDao.selectByPrimaryKey(businessId);
         if (ObjectUtil.isNull(business)) {
             throw new BaseException(CodeEnum.NOT_BUSINESS);
         }
@@ -220,6 +222,7 @@ public class SiteService implements ISiteService {
         siteInfoVo.setBusinessName(business.getName());
         //TODO
         siteInfoVo.setPath("http://test.tall.wiki/ct-dev/sign-history");
+        siteInfoVo.setDownloadPath(WebConstant.TEST_URL_BASE_CT + "/business/" + business.getId() + "/QrCode.zip");
         //获取场所信息
         List<SiteVo.SiteInfo> siteInfoList = new ArrayList<>();
         SiteExample siteExample = new SiteExample();

health/src/main/java/com/ccsens/health/bean/dto/AbnormalDto.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
@@ -39,19 +40,18 @@ public class AbnormalDto {
     @Data
     @ApiModel("新增异常人员信息")
     public static class AddAbnormal{
-        @NotNull
+        @NotEmpty
         @ApiModelProperty("学号")
         private String wkno;
-        @NotNull
+        @NotEmpty
         @ApiModelProperty("姓名")
         private String name;
-        @NotNull
+        @NotEmpty
         @ApiModelProperty("班级（所在机构）")
         private String department;
         @NotNull
         @ApiModelProperty("体温")
         private BigDecimal animalHeat;
-        @NotNull
         @ApiModelProperty("原因")
         private String reason;
         @NotNull

health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java

@@ -8,6 +8,7 @@ import org.springframework.beans.BeanUtils;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
@@ -78,6 +79,8 @@ public class JourneyDto {
     public static class Query{
         @ApiModelProperty("场所上级")
         private String parentCode = "SXDX";
+        @ApiModelProperty("场所名称 不传则查询所有，传了就模糊查询符合条件的数据")
+        private String siteName;
         @ApiModelProperty("第几页")
         @Min(value = 1)
         private int pageNum = 1;
@@ -145,7 +148,7 @@ public class JourneyDto {
         @NotNull
         @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他")
         private int tripMode;
-        @NotNull
+        @NotEmpty
         @ApiModelProperty("车次号")
         private String carNo;
         @NotNull

health/src/main/java/com/ccsens/health/persist/dao/JourneyAbnormalDao.java

@@ -9,5 +9,5 @@ import java.util.List;
 
 @Repository
 public interface JourneyAbnormalDao extends JourneyAbnormalMapper {
-    List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(@Param("carNo") String carNo, @Param("tripMode") int tripMode, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
+    List<JourneyVo.AddAbnormalJourney> selectAbnormalJourney(@Param("carNo") String carNo, @Param("tripMode") Integer tripMode, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 }

health/src/main/java/com/ccsens/health/service/JourneyService.java

@@ -168,7 +168,8 @@ public class JourneyService implements IJourneyService{
         JourneyDto.SelectAbnormalJourney abnormalJourney = params.getParam();
         Long startTime = abnormalJourney.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : abnormalJourney.getStartTime();
         Long endTime = abnormalJourney.getEndTime() == null ? System.currentTimeMillis() : abnormalJourney.getEndTime();
-        Integer page = abnormalJourney.getPage() == null ? 1 : abnormalJourney.getPage();
+        int page = abnormalJourney.getPage() == null ? 1 : abnormalJourney.getPage();
+
         PageHelper.startPage(page, 10);
         List<JourneyVo.AddAbnormalJourney> addAbnormalJourneyList =
                 journeyAbnormalDao.selectAbnormalJourney(abnormalJourney.getCarNo(),abnormalJourney.getTripMode(),startTime,endTime);

health/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: common, util-dev
+    include: common, util-test

health/src/main/resources/mapper_dao/SiteDao.xml

@@ -11,6 +11,9 @@
             <if test="parentCode != null and parentCode != ''">
                 and parent_code = #{parentCode, jdbcType=VARCHAR}
             </if>
+            <if test="siteName != null and siteName != ''">
+                and site_name like concat('%',#{siteName, jdbcType=VARCHAR},'%')
+            </if>
             ) t
         left join
          (select * from t_site_qrcode where out_or_in = 0 ) t1