修改指令

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/AlertSummaryController.java

@@ -24,7 +24,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
  * @date 2021-07-22
  */
 @RestController
-@Api(tags = "Api")
+@Api(tags = "战评总结Api")
 @RequestMapping(value = "/command/alert-summary")
 public class AlertSummaryController extends BaseController {
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -71,7 +71,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "JQ/list")
     @ApiOperation(httpMethod = "GET", value = "警情列表查询", notes = "警情列表查询")
     public ResponseModel<Object> listPage(RequestData par) {
@@ -85,7 +85,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "ZDDW/list")
     @ApiOperation(httpMethod = "GET", value = "保卫目标列表分页查询", notes = "保卫目标列表分页查询")
     public ResponseModel<IPage<CompanyDto>> listPageZDDW(Integer pageNum, Integer pageSize, RequestData par) {
@@ -106,7 +106,7 @@ public class CommandController extends BaseController {
     * </PRE>
     * 保卫目标详情
     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "ZDDW/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "保卫目标详情", notes = "保卫目标详情")
     public ResponseModel<OrgUsrFormDto> selectZDDWById(@PathVariable Long id) throws Exception {
@@ -122,7 +122,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "WX/list")
     @ApiOperation(httpMethod = "GET", value = "微型消防站列表分页查询", notes = "微型消防站列表分页查询")
     public ResponseModel<IPage<FireStationzhDto>> listPageWx(Integer pageNum, Integer pageSize, RequestData par) {
@@ -138,7 +138,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "SY500/list")
     @ApiOperation(httpMethod = "GET", value = "500水源列表分页查询", notes = "500水源列表分页查询")
     public ResponseModel<IPage<WaterResourceZhDto>> listPageSY500(Integer pageNum, Integer pageSize, RequestData par) {
@@ -160,7 +160,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "SY1000/list")
     @ApiOperation(httpMethod = "GET", value = "1000水源列表分页查询", notes = "1000水源列表分页查询")
     public ResponseModel<IPage<WaterResourceZhDto>> listPageSY1000(Integer pageNum, Integer pageSize, RequestData par) {
@@ -180,7 +180,7 @@ public class CommandController extends BaseController {
 //     *
 //     * @return
 //     */
-//    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+//    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
 //    @GetMapping(value = "SYTY/list")
 //    @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
 //    public ResponseModel<IPage<WaterResourceZhDto>> listPageSYTY(Integer pageNum, Integer pageSize, RequestData par) {
@@ -198,7 +198,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "DW/list")
     @ApiOperation(httpMethod = "GET", value = "消防队伍列表分页查询", notes = "消防队伍列表分页查询")
     public ResponseModel<IPage<FireTeamZhDto>> listPage(Integer pageNum, Integer pageSize, RequestData par) {
@@ -216,7 +216,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "linkageForce/list")
     @ApiOperation(httpMethod = "GET", value = "联动力量列表分页查询", notes = "联动力量列表分页查询")
     public ResponseModel<IPage<LinkageUnitZhDto>> linkageForcelistPage(Integer pageNum, Integer pageSize, RequestData par) {
@@ -250,7 +250,7 @@ public class CommandController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "ZQ/list")
     @ApiOperation(httpMethod = "GET", value = "执勤实力列表分页查询", notes = "执勤实力列表分页查询")
     public ResponseModel<IPage<FireTeamZhDto>> ZQlistPage(Integer pageNum, Integer pageSize, RequestData par) {
@@ -270,7 +270,7 @@ public class CommandController extends BaseController {
      *
      * **/
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "JQ/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询灾情详情", notes = "根据id查询灾情详情")
     public ResponseModel<Object> selectById(@PathVariable Long id) {
@@ -287,7 +287,7 @@ public class CommandController extends BaseController {
      * @param id 主键
      *
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "WX/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询微型消防站", notes = "根据id查询微型消防站")
     public ResponseModel<FireStationDto> seleteOne(@PathVariable Long id) {
@@ -303,7 +303,7 @@ public class CommandController extends BaseController {
      * @param id 主键
      *
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "SY/{id}")
     @ApiOperation(httpMethod = "GET", value = "根据id查询水源", notes = "根据id查询水源")
     public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long id) {
@@ -317,7 +317,7 @@ public class CommandController extends BaseController {
      * @param id
      * @return
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "DW/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询队伍信息", notes = "根据id查询队伍信息")
     public ResponseModel<FireTeam> selectById(HttpServletRequest request, @PathVariable Long id) {
@@ -331,7 +331,7 @@ public class CommandController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/seismometeorology", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "跑马灯", notes = "跑马灯")
     public ResponseModel<Object> seismometeorology()throws Exception {
@@ -362,7 +362,7 @@ public class CommandController extends BaseController {
      * @param id
      * @return
      */
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "ZL/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据警情id查询指令信息", notes = "根据警情id查询指令信息")
     public ResponseModel<List<InstructionsZHDto>> selectZL(@PathVariable Long id) {
@@ -370,7 +370,7 @@ public class CommandController extends BaseController {
     }
 
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")
     public ResponseModel<Object> gwmcDataDictionaryFireChemical(@PathVariable String type) throws Exception {
@@ -378,7 +378,7 @@ public class CommandController extends BaseController {
          return ResponseHelper.buildResponse(list);
      }
 
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "危化品分页查询", notes = "危化品分页查询")
     public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
@@ -393,7 +393,7 @@ public class CommandController extends BaseController {
     }
 
 
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
     public ResponseModel<Object> gwmcDataDictionary(@PathVariable String type) throws Exception {
@@ -403,7 +403,7 @@ public class CommandController extends BaseController {
 
     }
 
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "fireExperts/page")
     @ApiOperation(httpMethod = "GET", value = "外部专家分页查询", notes = "外部专家分页查询")
     public ResponseModel<IPage<FireExpertsDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
@@ -418,7 +418,7 @@ public class CommandController extends BaseController {
     }
 
 
-    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true,ApiLevel = UserType.AGENCY)
     @GetMapping(value = "LinkageUnitDto/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoqueryForPage(@RequestParam(value = "pageNum") int pageNum,
@@ -435,7 +435,7 @@ public class CommandController extends BaseController {
 
     
     
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "内部专家列表分页查询", notes = "内部专家列表分页查询")
     public ResponseModel<Page<FirefightersZhDto>> getFirefighters(Integer pageNum, Integer pageSize,

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -443,21 +443,21 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 case "警情初报":
 
 
-                    content="通知"+AlertSubmittedZHDto.getUserName()+","+js.getString("address")+"发生"+js.getString("alertType");
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+js.getString("address")+"发生"+js.getString("alertType");
 
                     break;
                 case "警情续报":
 
-                    content="通知"+AlertSubmittedZHDto.getUserName()+","+"现场被困人数："+js.getString("trappedNum")+"人伤亡人数："+js.getString("casualtiesNum")+"人。";
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+"现场被困人数："+js.getString("trappedNum")+"人伤亡人数："+js.getString("casualtiesNum")+"人。";
 
                     break;
                 case "非警情确认":
 
-                    content="通知"+AlertSubmittedZHDto.getUserName()+","+"此警情现场确认为假警情。";
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+"此警情现场确认为假警情。";
 
                     break;
                 case "警情结案":
-                    content="通知"+AlertSubmittedZHDto.getUserName()+","+"此警情已完场警情处置，警情已结案。";
+                    content="通知"+ AlertSubmittedZHDto.getCompanyName()+":"+AlertSubmittedZHDto.getUserName()+","+"此警情已完场警情处置，警情已结案。";
                     break;
 
                 default: