Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/controller/platform/IotInterfaceController.java

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -29,6 +29,7 @@ public class IotRequestMapping {
        public static final String interfaceAudit = api_iot_common + "/interfaceAudit";
        public static final String monitorPlatform = api_iot_common + "/monitorPlatform";
        public static final String sim = api_iot_common + "/sim";
        public static final String dict = api_iot_common + "/dict";
        public static final String message_success_update = "update success";
@@ -201,6 +202,7 @@ public class IotRequestMapping {
        public static final String api_update = "updateDeviceDict";
        public static final String api_queryPage = "queryDeviceDictPage";
        public static final String api_getList = "getDeviceDictList";
        public static final String api_findByDictName = "api_findByDictName";
        public static final String message_success_update = "deviceDict update success";
        public static final String message_success_delete = "deviceDict delete success";
@@ -262,6 +264,7 @@ public class IotRequestMapping {
        public static final String conditionQueryPage = "conditionQueryPage";
        public static final String findAllSim = "findAllSim";
        public static final String remind = "remind";
        public static final String findRemind = "findRemind";
        public static final String message_success_add = "sim add success";
        public static final String message_success_edit = "sim edit success";
@@ -448,4 +451,14 @@ public class IotRequestMapping {
        public static final String message_success_create = "hospital create success";
        public static final String message_success_delete = "hospital delete success";
    }
    /**
     * 单位模块常量
     */
    public static class Dict{
        public static final String findDict = "findDict";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/dict/IotSystemDictVO.java

@@ -18,6 +18,10 @@ public class IotSystemDictVO implements Serializable {
    private String code;//
    @ApiModelProperty("字典项值")
    private String value;//
    @ApiModelProperty("字典时间")
    private String time;
    @ApiModelProperty("字典状态")
    private Integer status;
    public String getCode() {
        return code;
@@ -35,4 +39,19 @@ public class IotSystemDictVO implements Serializable {
        this.value = value;
    }
    public String getTime() {
        return time;
    }
    public void setTime(String time) {
        this.time = time;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceSimController.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.entity.iot.platform.IotInterfaceAuditDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyVO;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.iot.IotRequestMapping;
@@ -139,6 +140,4 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/dict/IotDeviceDictController.java

@@ -2,6 +2,7 @@ package com.yihu.iot.controller.dict;
import com.yihu.iot.service.dict.IotDeviceDictService;
import com.yihu.jw.entity.iot.dict.IotDeviceDictDO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.iot.IotRequestMapping;
@@ -54,4 +55,6 @@ public class IotDeviceDictController extends EnvelopRestEndpoint {
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/dict/IotSystemDictController.java

@@ -0,0 +1,43 @@
package com.yihu.iot.controller.dict;
import com.yihu.iot.service.dict.IotSystemDictService;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/5/18
 */
@RestController
@RequestMapping(IotRequestMapping.Common.dict)
@Api(tags = "字典管理相关操作", description = "字典管理相关操作")
public class IotSystemDictController {
    @Autowired
    private IotSystemDictService iotSystemDictService;
    @GetMapping(value = IotRequestMapping.Dict.findDict)
    @ApiOperation(value = "根据字典名称获取字典信息",notes = "根据字典名称获取字典信息")
    public MixEnvelop<IotSystemDictVO,IotSystemDictVO> findDict( @ApiParam(name = "dictName", value = "字典名称")
                                                                           @RequestParam(value = "dictName", required = false) String dictName){
        try {
            IotSystemDictVO  systemDictVO = iotSystemDictService.findDict(dictName);
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceSim.message_success_find,systemDictVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceSimService.java

@@ -14,6 +14,7 @@ import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.platform.IotInterfaceAuditDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyVO;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.http.HttpClientUtil;
@@ -215,4 +216,5 @@ public class IotDeviceSimService  extends BaseJpaService<IotDeviceSimDO, IotDevi
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/dict/IotSystemDictService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.iot.service.common.MyJdbcTemplate;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -101,4 +102,8 @@ public class IotSystemDictService extends BaseJpaService<IotSystemDictDO,IotSyst
        List<JSONObject> list = myJdbcTemplate.queryJson(sql,new Object[]{});
        return list;
    }
    public IotSystemDictVO findDict(String dictName) {
        return null;
    }
}